Merge branch 'main' into desktop/pm-18769/migrate-vault-filters

2026-02-13 06:54:07 +00:00 · 2026-01-02 12:40:17 -05:00
parent d630cbf8c3 3558db0e0c
commit 7eb26de3eb
181 changed files with 6039 additions and 1846 deletions
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@bitwarden/web-vault",
-  "version": "2025.12.1",
+  "version": "2025.12.2",
  "scripts": {
    "build:oss": "webpack",
    "build:bit": "webpack -c ../../bitwarden_license/bit-web/webpack.config.js",
--- a/apps/web/src/app/admin-console/organizations/collections/vault.component.ts
+++ b/apps/web/src/app/admin-console/organizations/collections/vault.component.ts
@@ -588,6 +588,9 @@ export class VaultComponent implements OnInit, OnDestroy {
          queryParams: { search: Utils.isNullOrEmpty(searchText) ? null : searchText },
          queryParamsHandling: "merge",
          replaceUrl: true,
+          state: {
+            focusMainAfterNav: false,
+          },
        }),
      );

--- a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-webauthn.component.html
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-webauthn.component.html
@@ -16,27 +16,26 @@
      <img class="tw-float-right tw-ml-5 mfaType7" alt="FIDO2 WebAuthn logo" />
      <ul class="bwi-ul">
        <li *ngFor="let k of keys; let i = index" #removeKeyBtn [appApiAction]="k.removePromise">
-          <i class="bwi bwi-li bwi-key"></i>
-          <span *ngIf="!k.configured || !k.name" bitTypography="body1" class="tw-font-medium">
-            {{ "webAuthnkeyX" | i18n: (i + 1).toString() }}
-          </span>
-          <span *ngIf="k.configured && k.name" bitTypography="body1" class="tw-font-medium">
-            {{ k.name }}
-          </span>
-          <ng-container *ngIf="k.configured && !$any(removeKeyBtn).loading">
-            <ng-container *ngIf="k.migrated">
-              <span>{{ "webAuthnMigrated" | i18n }}</span>
+          <ng-container *ngIf="k.configured">
+            <i class="bwi bwi-li bwi-key"></i>
+            <span *ngIf="k.configured" bitTypography="body1" class="tw-font-medium">
+              {{ k.name || ("unnamedKey" | i18n) }}
+            </span>
+            <ng-container *ngIf="k.configured && !$any(removeKeyBtn).loading">
+              <ng-container *ngIf="k.migrated">
+                <span>{{ "webAuthnMigrated" | i18n }}</span>
+              </ng-container>
+            </ng-container>
+            <ng-container *ngIf="keysConfiguredCount > 1 && k.configured">
+              <i
+                class="bwi bwi-spin bwi-spinner tw-text-muted bwi-fw"
+                title="{{ 'loading' | i18n }}"
+                *ngIf="$any(removeKeyBtn).loading"
+                aria-hidden="true"
+              ></i>
+              -
+              <a bitLink href="#" appStopClick (click)="remove(k)">{{ "remove" | i18n }}</a>
            </ng-container>
-          </ng-container>
-          <ng-container *ngIf="keysConfiguredCount > 1 && k.configured">
-            <i
-              class="bwi bwi-spin bwi-spinner tw-text-muted bwi-fw"
-              title="{{ 'loading' | i18n }}"
-              *ngIf="$any(removeKeyBtn).loading"
-              aria-hidden="true"
-            ></i>
-            -
-            <a bitLink href="#" appStopClick (click)="remove(k)">{{ "remove" | i18n }}</a>
          </ng-container>
        </li>
      </ul>
@@ -60,7 +59,9 @@
        type="button"
        [bitAction]="readKey"
        buttonType="secondary"
-        [disabled]="$any(readKeyBtn).loading() || webAuthnListening || !keyIdAvailable"
+        [disabled]="
+          $any(readKeyBtn).loading() || webAuthnListening || !keyIdAvailable || formGroup.invalid
+        "
        class="tw-mr-2"
        #readKeyBtn
      >
--- 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
@@ -1,6 +1,6 @@
 import { CommonModule } from "@angular/common";
 import { Component, Inject, NgZone } from "@angular/core";
-import { FormControl, FormGroup, ReactiveFormsModule } from "@angular/forms";
+import { FormControl, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms";

 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
@@ -99,7 +99,7 @@ export class TwoFactorSetupWebAuthnComponent extends TwoFactorSetupMethodBaseCom
      toastService,
    );
    this.formGroup = new FormGroup({
-      name: new FormControl({ value: "", disabled: false }),
+      name: new FormControl({ value: "", disabled: false }, Validators.required),
    });
    this.auth(data);
  }
@@ -213,7 +213,22 @@ export class TwoFactorSetupWebAuthnComponent extends TwoFactorSetupMethodBaseCom
    this.webAuthnListening = listening;
  }

+  private findNextAvailableKeyId(existingIds: Set<number>): number {
+    // Search for first gap, bounded by current key count + 1
+    for (let i = 1; i <= existingIds.size + 1; i++) {
+      if (!existingIds.has(i)) {
+        return i;
+      }
+    }
+
+    // This should never be reached due to loop bounds, but TypeScript requires a return
+    throw new Error("Unable to find next available key ID");
+  }
+
  private processResponse(response: TwoFactorWebAuthnResponse) {
+    if (!response.keys || response.keys.length === 0) {
+      response.keys = [];
+    }
    this.resetWebAuthn();
    this.keys = [];
    this.keyIdAvailable = null;
@@ -223,26 +238,37 @@ export class TwoFactorSetupWebAuthnComponent extends TwoFactorSetupMethodBaseCom
      nameControl.setValue("");
    }
    this.keysConfiguredCount = 0;
-    for (let i = 1; i <= 5; i++) {
-      if (response.keys != null) {
-        const key = response.keys.filter((k) => k.id === i);
-        if (key.length > 0) {
-          this.keysConfiguredCount++;
-          this.keys.push({
-            id: i,
-            name: key[0].name,
-            configured: true,
-            migrated: key[0].migrated,
-            removePromise: null,
-          });
-          continue;
-        }
-      }
-      this.keys.push({ id: i, name: "", configured: false, removePromise: null });
-      if (this.keyIdAvailable == null) {
-        this.keyIdAvailable = i;
-      }
+
+    // Build configured keys
+    for (const key of response.keys) {
+      this.keysConfiguredCount++;
+      this.keys.push({
+        id: key.id,
+        name: key.name,
+        configured: true,
+        migrated: key.migrated,
+        removePromise: null,
+      });
    }
+
+    // [PM-20109]: To accommodate the existing form logic with minimal changes,
+    // we need to have at least one unconfigured key slot available to the collection.
+    // Prior to PM-20109, both client and server had hard checks for IDs <= 5.
+    // While we don't have any technical constraints _at this time_, we should avoid
+    // unbounded growth of key IDs over time as users add/remove keys;
+    // this strategy gap-fills key IDs.
+    const existingIds = new Set(response.keys.map((k) => k.id));
+    const nextId = this.findNextAvailableKeyId(existingIds);
+
+    // Add unconfigured slot, which can be used to add a new key
+    this.keys.push({
+      id: nextId,
+      name: "",
+      configured: false,
+      removePromise: null,
+    });
+    this.keyIdAvailable = nextId;
+
    this.enabled = response.enabled;
    this.onUpdated.emit(this.enabled);
  }
--- 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
@@ -29,7 +29,7 @@
      <app-display-billing-address
        [subscriber]="view.organization"
        [billingAddress]="view.billingAddress"
-        [taxIdWarning]="enableTaxIdWarning ? view.taxIdWarning : null"
+        [taxIdWarning]="view.taxIdWarning"
        (updated)="setBillingAddress($event)"
      ></app-display-billing-address>

--- 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
@@ -22,8 +22,6 @@ import { OrganizationService } from "@bitwarden/common/admin-console/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 { getById } from "@bitwarden/common/platform/misc";
 import { DialogService } from "@bitwarden/components";
 import { CommandDefinition, MessageListener } from "@bitwarden/messaging";
@@ -118,12 +116,9 @@ export class OrganizationPaymentDetailsComponent implements OnInit, OnDestroy {

  private destroy$ = new Subject<void>();

-  protected enableTaxIdWarning!: boolean;
-
  constructor(
    private accountService: AccountService,
    private activatedRoute: ActivatedRoute,
-    private configService: ConfigService,
    private dialogService: DialogService,
    private messageListener: MessageListener,
    private organizationService: OrganizationService,
@@ -140,36 +135,30 @@ export class OrganizationPaymentDetailsComponent implements OnInit, OnDestroy {
      await this.changePaymentMethod();
    }

-    this.enableTaxIdWarning = await this.configService.getFeatureFlag(
-      FeatureFlag.PM22415_TaxIDWarnings,
-    );
-
-    if (this.enableTaxIdWarning) {
-      this.organizationWarningsService.taxIdWarningRefreshed$
-        .pipe(
-          switchMap((warning) =>
-            combineLatest([
-              of(warning),
-              this.organization$.pipe(take(1)).pipe(
-                mapOrganizationToSubscriber,
-                switchMap((organization) =>
-                  this.subscriberBillingClient.getBillingAddress(organization),
-                ),
+    this.organizationWarningsService.taxIdWarningRefreshed$
+      .pipe(
+        switchMap((warning) =>
+          combineLatest([
+            of(warning),
+            this.organization$.pipe(take(1)).pipe(
+              mapOrganizationToSubscriber,
+              switchMap((organization) =>
+                this.subscriberBillingClient.getBillingAddress(organization),
              ),
-            ]),
-          ),
-          takeUntil(this.destroy$),
-        )
-        .subscribe(([taxIdWarning, billingAddress]) => {
-          if (this.viewState$.value) {
-            this.viewState$.next({
-              ...this.viewState$.value,
-              taxIdWarning,
-              billingAddress,
-            });
-          }
-        });
-    }
+            ),
+          ]),
+        ),
+        takeUntil(this.destroy$),
+      )
+      .subscribe(([taxIdWarning, billingAddress]) => {
+        if (this.viewState$.value) {
+          this.viewState$.next({
+            ...this.viewState$.value,
+            taxIdWarning,
+            billingAddress,
+          });
+        }
+      });

    this.messageListener
      .messages$(BANK_ACCOUNT_VERIFIED_COMMAND)
@@ -216,10 +205,7 @@ export class OrganizationPaymentDetailsComponent implements OnInit, OnDestroy {

  setBillingAddress = (billingAddress: BillingAddress) => {
    if (this.viewState$.value) {
-      if (
-        this.enableTaxIdWarning &&
-        this.viewState$.value.billingAddress?.taxId !== billingAddress.taxId
-      ) {
+      if (this.viewState$.value.billingAddress?.taxId !== billingAddress.taxId) {
        this.organizationWarningsService.refreshTaxIdWarning();
      }
      this.viewState$.next({
--- a/apps/web/src/app/billing/warnings/components/tax-id-warning.component.ts
+++ b/apps/web/src/app/billing/warnings/components/tax-id-warning.component.ts
@@ -12,8 +12,6 @@ import {

 import { Account, 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 { BannerModule, DialogService } from "@bitwarden/components";
 import { BILLING_DISK, StateProvider, UserKeyDefinition } from "@bitwarden/state";
@@ -88,23 +86,21 @@ type GetWarning$ = () => Observable<TaxIdWarningType | null>;
@Component({
  selector: "app-tax-id-warning",
  template: `
-    @if (enableTaxIdWarning$ | async) {
-      @let view = view$ | async;
+    @let view = view$ | async;

-      @if (view) {
-        <bit-banner id="tax-id-warning-banner" bannerType="warning" (onClose)="trackDismissal()">
-          {{ view.message }}
-          <a
-            bitLink
-            linkType="secondary"
-            (click)="editBillingAddress()"
-            class="tw-cursor-pointer"
-            rel="noreferrer noopener"
-          >
-            {{ view.callToAction }}
-          </a>
-        </bit-banner>
-      }
+    @if (view) {
+      <bit-banner id="tax-id-warning-banner" bannerType="warning" (onClose)="trackDismissal()">
+        {{ view.message }}
+        <a
+          bitLink
+          linkType="secondary"
+          (click)="editBillingAddress()"
+          class="tw-cursor-pointer"
+          rel="noreferrer noopener"
+        >
+          {{ view.callToAction }}
+        </a>
+      </bit-banner>
    }
  `,
  imports: [BannerModule, SharedModule],
@@ -120,10 +116,6 @@ export class TaxIdWarningComponent implements OnInit {
  // eslint-disable-next-line @angular-eslint/prefer-output-emitter-ref
  @Output() billingAddressUpdated = new EventEmitter<void>();

-  protected enableTaxIdWarning$ = this.configService.getFeatureFlag$(
-    FeatureFlag.PM22415_TaxIDWarnings,
-  );
-
  protected userId$ = this.accountService.activeAccount$.pipe(
    filter((account): account is Account => account !== null),
    getUserId,
@@ -209,7 +201,6 @@ export class TaxIdWarningComponent implements OnInit {

  constructor(
    private accountService: AccountService,
-    private configService: ConfigService,
    private dialogService: DialogService,
    private i18nService: I18nService,
    private subscriberBillingClient: SubscriberBillingClient,
--- a/apps/web/src/app/dirt/reports/pages/exposed-passwords-report.component.html
+++ b/apps/web/src/app/dirt/reports/pages/exposed-passwords-report.component.html
@@ -26,7 +26,7 @@
          </bit-toggle>
        </ng-container>
      </bit-toggle-group>
-      <bit-table-scroll [dataSource]="dataSource" [rowSize]="53">
+      <bit-table-scroll [dataSource]="dataSource" [rowSize]="75">
        <ng-container header>
          <th bitCell></th>
          <th bitCell bitSortable="name">{{ "name" | i18n }}</th>
--- a/apps/web/src/app/dirt/reports/pages/weak-passwords-report.component.html
+++ b/apps/web/src/app/dirt/reports/pages/weak-passwords-report.component.html
@@ -31,7 +31,7 @@
          </bit-toggle>
        </ng-container>
      </bit-toggle-group>
-      <bit-table-scroll [dataSource]="dataSource" [rowSize]="53">
+      <bit-table-scroll [dataSource]="dataSource" [rowSize]="75">
        <ng-container header>
          <th bitCell></th>
          <th bitCell bitSortable="name">{{ "name" | i18n }}</th>
--- a/apps/web/src/app/key-management/data-recovery/steps/cipher-step.spec.ts
+++ b/apps/web/src/app/key-management/data-recovery/steps/cipher-step.spec.ts
@@ -0,0 +1,269 @@
+import { mock, MockProxy } from "jest-mock-extended";
+
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { CipherEncryptionService } from "@bitwarden/common/vault/abstractions/cipher-encryption.service";
+import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
+import { DialogService } from "@bitwarden/components";
+import { UserId } from "@bitwarden/user-core";
+
+import { LogRecorder } from "../log-recorder";
+
+import { CipherStep } from "./cipher-step";
+import { RecoveryWorkingData } from "./recovery-step";
+
+describe("CipherStep", () => {
+  let cipherStep: CipherStep;
+  let apiService: MockProxy<ApiService>;
+  let cipherEncryptionService: MockProxy<CipherEncryptionService>;
+  let dialogService: MockProxy<DialogService>;
+  let logger: MockProxy<LogRecorder>;
+
+  beforeEach(() => {
+    apiService = mock<ApiService>();
+    cipherEncryptionService = mock<CipherEncryptionService>();
+    dialogService = mock<DialogService>();
+    logger = mock<LogRecorder>();
+
+    cipherStep = new CipherStep(apiService, cipherEncryptionService, dialogService);
+  });
+
+  describe("runDiagnostics", () => {
+    it("returns false and logs error when userId is missing", async () => {
+      const workingData: RecoveryWorkingData = {
+        userId: null,
+        userKey: null,
+        encryptedPrivateKey: null,
+        isPrivateKeyCorrupt: false,
+        ciphers: [],
+        folders: [],
+      };
+
+      const result = await cipherStep.runDiagnostics(workingData, logger);
+
+      expect(result).toBe(false);
+      expect(logger.record).toHaveBeenCalledWith("Missing user ID");
+    });
+
+    it("returns true when all user ciphers are decryptable", async () => {
+      const userId = "user-id" as UserId;
+      const cipher1 = { id: "cipher-1", organizationId: null } as Cipher;
+      const cipher2 = { id: "cipher-2", organizationId: null } as Cipher;
+
+      const workingData: RecoveryWorkingData = {
+        userId,
+        userKey: null,
+        encryptedPrivateKey: null,
+        isPrivateKeyCorrupt: false,
+        ciphers: [cipher1, cipher2],
+        folders: [],
+      };
+
+      cipherEncryptionService.decrypt.mockResolvedValue({} as any);
+
+      const result = await cipherStep.runDiagnostics(workingData, logger);
+
+      expect(result).toBe(true);
+      expect(cipherEncryptionService.decrypt).toHaveBeenCalledWith(cipher1, userId);
+      expect(cipherEncryptionService.decrypt).toHaveBeenCalledWith(cipher2, userId);
+    });
+
+    it("filters out organization ciphers (organizationId !== null) and only processes user ciphers", async () => {
+      const userId = "user-id" as UserId;
+      const userCipher = { id: "user-cipher", organizationId: null } as Cipher;
+      const orgCipher1 = { id: "org-cipher-1", organizationId: "org-1" } as Cipher;
+      const orgCipher2 = { id: "org-cipher-2", organizationId: "org-2" } as Cipher;
+
+      const workingData: RecoveryWorkingData = {
+        userId,
+        userKey: null,
+        encryptedPrivateKey: null,
+        isPrivateKeyCorrupt: false,
+        ciphers: [userCipher, orgCipher1, orgCipher2],
+        folders: [],
+      };
+
+      cipherEncryptionService.decrypt.mockResolvedValue({} as any);
+
+      const result = await cipherStep.runDiagnostics(workingData, logger);
+
+      expect(result).toBe(true);
+      // Only user cipher should be processed
+      expect(cipherEncryptionService.decrypt).toHaveBeenCalledTimes(1);
+      expect(cipherEncryptionService.decrypt).toHaveBeenCalledWith(userCipher, userId);
+      // Organization ciphers should not be processed
+      expect(cipherEncryptionService.decrypt).not.toHaveBeenCalledWith(orgCipher1, userId);
+      expect(cipherEncryptionService.decrypt).not.toHaveBeenCalledWith(orgCipher2, userId);
+    });
+
+    it("returns false and records undecryptable user ciphers", async () => {
+      const userId = "user-id" as UserId;
+      const cipher1 = { id: "cipher-1", organizationId: null } as Cipher;
+      const cipher2 = { id: "cipher-2", organizationId: null } as Cipher;
+      const cipher3 = { id: "cipher-3", organizationId: null } as Cipher;
+
+      const workingData: RecoveryWorkingData = {
+        userId,
+        userKey: null,
+        encryptedPrivateKey: null,
+        isPrivateKeyCorrupt: false,
+        ciphers: [cipher1, cipher2, cipher3],
+        folders: [],
+      };
+
+      cipherEncryptionService.decrypt
+        .mockResolvedValueOnce({} as any) // cipher1 succeeds
+        .mockRejectedValueOnce(new Error("Decryption failed")) // cipher2 fails
+        .mockRejectedValueOnce(new Error("Decryption failed")); // cipher3 fails
+
+      const result = await cipherStep.runDiagnostics(workingData, logger);
+
+      expect(result).toBe(false);
+      expect(logger.record).toHaveBeenCalledWith("Cipher ID cipher-2 was undecryptable");
+      expect(logger.record).toHaveBeenCalledWith("Cipher ID cipher-3 was undecryptable");
+      expect(logger.record).toHaveBeenCalledWith("Found 2 undecryptable ciphers");
+    });
+  });
+
+  describe("canRecover", () => {
+    it("returns false when there are no undecryptable ciphers", async () => {
+      const userId = "user-id" as UserId;
+      const workingData: RecoveryWorkingData = {
+        userId,
+        userKey: null,
+        encryptedPrivateKey: null,
+        isPrivateKeyCorrupt: false,
+        ciphers: [
+          { id: "cipher-1", organizationId: null } as Cipher,
+          { id: "cipher-2", organizationId: null } as Cipher,
+        ],
+        folders: [],
+      };
+
+      cipherEncryptionService.decrypt.mockResolvedValue({} as any);
+
+      await cipherStep.runDiagnostics(workingData, logger);
+      const result = cipherStep.canRecover(workingData);
+
+      expect(result).toBe(false);
+    });
+
+    it("returns true when there are undecryptable ciphers but at least one decryptable cipher", async () => {
+      const userId = "user-id" as UserId;
+      const workingData: RecoveryWorkingData = {
+        userId,
+        userKey: null,
+        encryptedPrivateKey: null,
+        isPrivateKeyCorrupt: false,
+        ciphers: [
+          { id: "cipher-1", organizationId: null } as Cipher,
+          { id: "cipher-2", organizationId: null } as Cipher,
+        ],
+        folders: [],
+      };
+
+      cipherEncryptionService.decrypt.mockRejectedValueOnce(new Error("Decryption failed"));
+
+      await cipherStep.runDiagnostics(workingData, logger);
+      const result = cipherStep.canRecover(workingData);
+
+      expect(result).toBe(true);
+    });
+
+    it("returns false when all ciphers are undecryptable", async () => {
+      const userId = "user-id" as UserId;
+      const workingData: RecoveryWorkingData = {
+        userId,
+        userKey: null,
+        encryptedPrivateKey: null,
+        isPrivateKeyCorrupt: false,
+        ciphers: [
+          { id: "cipher-1", organizationId: null } as Cipher,
+          { id: "cipher-2", organizationId: null } as Cipher,
+        ],
+        folders: [],
+      };
+
+      cipherEncryptionService.decrypt.mockRejectedValue(new Error("Decryption failed"));
+
+      await cipherStep.runDiagnostics(workingData, logger);
+      const result = cipherStep.canRecover(workingData);
+
+      expect(result).toBe(false);
+    });
+  });
+
+  describe("runRecovery", () => {
+    it("logs and returns early when there are no undecryptable ciphers", async () => {
+      const workingData: RecoveryWorkingData = {
+        userId: "user-id" as UserId,
+        userKey: null,
+        encryptedPrivateKey: null,
+        isPrivateKeyCorrupt: false,
+        ciphers: [],
+        folders: [],
+      };
+
+      await cipherStep.runRecovery(workingData, logger);
+
+      expect(logger.record).toHaveBeenCalledWith("No undecryptable ciphers to recover");
+      expect(dialogService.openSimpleDialog).not.toHaveBeenCalled();
+      expect(apiService.deleteCipher).not.toHaveBeenCalled();
+    });
+
+    it("throws error when user cancels deletion", async () => {
+      const userId = "user-id" as UserId;
+      const workingData: RecoveryWorkingData = {
+        userId,
+        userKey: null,
+        encryptedPrivateKey: null,
+        isPrivateKeyCorrupt: false,
+        ciphers: [{ id: "cipher-1", organizationId: null } as Cipher],
+        folders: [],
+      };
+
+      cipherEncryptionService.decrypt.mockRejectedValue(new Error("Decryption failed"));
+      await cipherStep.runDiagnostics(workingData, logger);
+
+      dialogService.openSimpleDialog.mockResolvedValue(false);
+
+      await expect(cipherStep.runRecovery(workingData, logger)).rejects.toThrow(
+        "Cipher recovery cancelled by user",
+      );
+
+      expect(logger.record).toHaveBeenCalledWith("Showing confirmation dialog for 1 ciphers");
+      expect(logger.record).toHaveBeenCalledWith("User cancelled cipher deletion");
+      expect(apiService.deleteCipher).not.toHaveBeenCalled();
+    });
+
+    it("deletes undecryptable ciphers when user confirms", async () => {
+      const userId = "user-id" as UserId;
+      const cipher1 = { id: "cipher-1", organizationId: null } as Cipher;
+      const cipher2 = { id: "cipher-2", organizationId: null } as Cipher;
+
+      const workingData: RecoveryWorkingData = {
+        userId,
+        userKey: null,
+        encryptedPrivateKey: null,
+        isPrivateKeyCorrupt: false,
+        ciphers: [cipher1, cipher2],
+        folders: [],
+      };
+
+      cipherEncryptionService.decrypt.mockRejectedValue(new Error("Decryption failed"));
+      await cipherStep.runDiagnostics(workingData, logger);
+
+      dialogService.openSimpleDialog.mockResolvedValue(true);
+      apiService.deleteCipher.mockResolvedValue(undefined);
+
+      await cipherStep.runRecovery(workingData, logger);
+
+      expect(logger.record).toHaveBeenCalledWith("Showing confirmation dialog for 2 ciphers");
+      expect(logger.record).toHaveBeenCalledWith("Deleting 2 ciphers");
+      expect(apiService.deleteCipher).toHaveBeenCalledWith("cipher-1");
+      expect(apiService.deleteCipher).toHaveBeenCalledWith("cipher-2");
+      expect(logger.record).toHaveBeenCalledWith("Deleted cipher cipher-1");
+      expect(logger.record).toHaveBeenCalledWith("Deleted cipher cipher-2");
+      expect(logger.record).toHaveBeenCalledWith("Successfully deleted 2 ciphers");
+    });
+  });
+});
--- a/apps/web/src/app/key-management/data-recovery/steps/cipher-step.ts
+++ b/apps/web/src/app/key-management/data-recovery/steps/cipher-step.ts
@@ -10,6 +10,7 @@ export class CipherStep implements RecoveryStep {
  title = "recoveryStepCipherTitle";

  private undecryptableCipherIds: string[] = [];
+  private decryptableCipherIds: string[] = [];

  constructor(
    private apiService: ApiService,
@@ -24,21 +25,28 @@ export class CipherStep implements RecoveryStep {
    }

    this.undecryptableCipherIds = [];
-    for (const cipher of workingData.ciphers) {
+    // The tool is currently only implemented to handle ciphers that are corrupt for a user. For an organization, the case of
+    // local user not having access to the organization key is not properly handled here, and should be implemented separately.
+    // For now, this just filters out and does not consider corrupt organization ciphers.
+    const userCiphers = workingData.ciphers.filter((c) => c.organizationId == null);
+    for (const cipher of userCiphers) {
      try {
        await this.cipherService.decrypt(cipher, workingData.userId);
+        this.decryptableCipherIds.push(cipher.id);
      } catch {
        logger.record(`Cipher ID ${cipher.id} was undecryptable`);
        this.undecryptableCipherIds.push(cipher.id);
      }
    }
    logger.record(`Found ${this.undecryptableCipherIds.length} undecryptable ciphers`);
+    logger.record(`Found ${this.decryptableCipherIds.length} decryptable ciphers`);

    return this.undecryptableCipherIds.length == 0;
  }

  canRecover(workingData: RecoveryWorkingData): boolean {
-    return this.undecryptableCipherIds.length > 0;
+    // If everything fails to decrypt, it's a deeper issue and we shouldn't offer recovery here.
+    return this.undecryptableCipherIds.length > 0 && this.decryptableCipherIds.length > 0;
  }

  async runRecovery(workingData: RecoveryWorkingData, logger: LogRecorder): Promise<void> {
--- a/apps/web/src/app/key-management/data-recovery/steps/folder-step.ts
+++ b/apps/web/src/app/key-management/data-recovery/steps/folder-step.ts
@@ -11,6 +11,7 @@ export class FolderStep implements RecoveryStep {
  title = "recoveryStepFoldersTitle";

  private undecryptableFolderIds: string[] = [];
+  private decryptableFolderIds: string[] = [];

  constructor(
    private folderService: FolderApiServiceAbstraction,
@@ -36,18 +37,21 @@ export class FolderStep implements RecoveryStep {
          folder.name.encryptedString,
          workingData.userKey.toEncoded(),
        );
+        this.decryptableFolderIds.push(folder.id);
      } catch {
        logger.record(`Folder name for folder ID ${folder.id} was undecryptable`);
        this.undecryptableFolderIds.push(folder.id);
      }
    }
    logger.record(`Found ${this.undecryptableFolderIds.length} undecryptable folders`);
+    logger.record(`Found ${this.decryptableFolderIds.length} decryptable folders`);

    return this.undecryptableFolderIds.length == 0;
  }

  canRecover(workingData: RecoveryWorkingData): boolean {
-    return this.undecryptableFolderIds.length > 0;
+    // If everything fails to decrypt, it's a deeper issue and we shouldn't offer recovery here.
+    return this.undecryptableFolderIds.length > 0 && this.decryptableFolderIds.length > 0;
  }

  async runRecovery(workingData: RecoveryWorkingData, logger: LogRecorder): Promise<void> {
--- a/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.component.spec.ts
+++ b/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.component.spec.ts
@@ -7,10 +7,12 @@ import { BehaviorSubject } from "rxjs";

 import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { FakeGlobalStateProvider } from "@bitwarden/common/spec";
 import { IconButtonModule, NavigationModule } from "@bitwarden/components";
 // FIXME: remove `src` and fix import
 // eslint-disable-next-line no-restricted-imports
 import { NavItemComponent } from "@bitwarden/components/src/navigation/nav-item.component";
+import { GlobalStateProvider } from "@bitwarden/state";

 import { ProductSwitcherItem, ProductSwitcherService } from "../shared/product-switcher.service";

@@ -59,6 +61,8 @@ describe("NavigationProductSwitcherComponent", () => {
    productSwitcherService.shouldShowPremiumUpgradeButton$ = mockShouldShowPremiumUpgradeButton$;
    mockProducts$.next({ bento: [], other: [] });

+    const fakeGlobalStateProvider = new FakeGlobalStateProvider();
+
    await TestBed.configureTestingModule({
      imports: [RouterModule, NavigationModule, IconButtonModule, MockUpgradeNavButtonComponent],
      declarations: [NavigationProductSwitcherComponent, I18nPipe],
@@ -72,6 +76,10 @@ describe("NavigationProductSwitcherComponent", () => {
          provide: ActivatedRoute,
          useValue: mock<ActivatedRoute>(),
        },
+        {
+          provide: GlobalStateProvider,
+          useValue: fakeGlobalStateProvider,
+        },
      ],
    }).compileComponents();
  });
--- 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
@@ -16,10 +16,15 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SyncService } from "@bitwarden/common/platform/sync";
 import { UserId } from "@bitwarden/common/types/guid";
-import { LayoutComponent, NavigationModule } from "@bitwarden/components";
+import {
+  LayoutComponent,
+  NavigationModule,
+  StorybookGlobalStateProvider,
+} 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 { GlobalStateProvider } from "@bitwarden/state";
 import { I18nPipe } from "@bitwarden/ui-common";

 import { ProductSwitcherService } from "../shared/product-switcher.service";
@@ -82,7 +87,7 @@ class MockAccountService implements Partial<AccountService> {
    name: "Test User 1",
    email: "test@email.com",
    emailVerified: true,
-    creationDate: "2024-01-01T00:00:00.000Z",
+    creationDate: new Date("2024-01-01T00:00:00.000Z"),
  });
 }

@@ -183,6 +188,10 @@ export default {
            },
          ]),
        ),
+        {
+          provide: GlobalStateProvider,
+          useClass: StorybookGlobalStateProvider,
+        },
      ],
    }),
  ],
--- a/apps/web/src/app/layouts/product-switcher/product-switcher.stories.ts
+++ b/apps/web/src/app/layouts/product-switcher/product-switcher.stories.ts
@@ -82,7 +82,7 @@ class MockAccountService implements Partial<AccountService> {
    name: "Test User 1",
    email: "test@email.com",
    emailVerified: true,
-    creationDate: "2024-01-01T00:00:00.000Z",
+    creationDate: new Date("2024-01-01T00:00:00.000Z"),
  });
 }

--- 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
@@ -39,7 +39,8 @@ 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 { CipherViewLike } from "@bitwarden/common/vault/utils/cipher-view-like-utils";
-import { LayoutComponent } from "@bitwarden/components";
+import { LayoutComponent, StorybookGlobalStateProvider } from "@bitwarden/components";
+import { GlobalStateProvider } from "@bitwarden/state";
 import { RoutedVaultFilterService } from "@bitwarden/web-vault/app/vault/individual-vault/vault-filter/services/routed-vault-filter.service";

 import { GroupView } from "../../../admin-console/organizations/core";
@@ -168,6 +169,10 @@ export default {
      providers: [
        importProvidersFrom(RouterModule.forRoot([], { useHash: true })),
        importProvidersFrom(PreloadedEnglishI18nModule),
+        {
+          provide: GlobalStateProvider,
+          useClass: StorybookGlobalStateProvider,
+        },
      ],
    }),
  ],
--- a/apps/web/src/app/vault/individual-vault/vault.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault.component.ts
@@ -423,6 +423,9 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
          queryParams: { search: Utils.isNullOrEmpty(searchText) ? null : searchText },
          queryParamsHandling: "merge",
          replaceUrl: true,
+          state: {
+            focusMainAfterNav: false,
+          },
        }),
      );

--- a/apps/web/src/index.html
+++ b/apps/web/src/index.html
@@ -122,7 +122,6 @@
                </clipPath>
              </defs>
            </svg>
-            `;
          </div>

          <div
--- a/apps/web/src/locales/az/messages.json
+++ b/apps/web/src/locales/az/messages.json
@@ -392,7 +392,7 @@
    "message": "Yeni tətbiqlər incələ"
  },
  "reviewNewAppsDescription": {
-    "message": "Review new applications with vulnerable items and mark those you’d like to monitor closely as critical. Then, you’ll be able to assign security tasks to members to remove risks."
+    "message": "Həssas elementlərə sahib yeni tətbiqləri incələyin və diqqətlə izləmək istədiklərinizi kritik olaraq işarələyin. Sonra, riskləri xaric etmək üçün üzvlərə təhlükəsizlik tapşırıqları təyin edə biləcəksiniz."
  },
  "clickIconToMarkAppAsCritical": {
    "message": "Bir tətbiqi kritik olaraq işarələmək üçün ulduz ikonuna klikləyin"
@@ -1970,11 +1970,11 @@
    "message": "Hesab şifrələmə açarları, hər Bitwarden istifadəçi hesabı üçün unikaldır, buna görə də şifrələnmiş bir ixracı, fərqli bir hesaba idxal edə bilməzsiniz."
  },
  "exportNoun": {
-    "message": "Export",
+    "message": "Xaricə köçürmə",
    "description": "The noun form of the word Export"
  },
  "exportVerb": {
-    "message": "Export",
+    "message": "Xaricə köçür",
    "description": "The verb form of the word Export"
  },
  "exportFrom": {
@@ -2303,11 +2303,11 @@
    "message": "Alətlər"
  },
  "importNoun": {
-    "message": "Import",
+    "message": "Daxilə köçürmə",
    "description": "The noun form of the word Import"
  },
  "importVerb": {
-    "message": "Import",
+    "message": "Daxilə köçür",
    "description": "The verb form of the word Import"
  },
  "importData": {
@@ -3294,7 +3294,7 @@
    "message": "Bulud Abunəliyini Başlat"
  },
  "launchCloudSubscriptionSentenceCase": {
-    "message": "Launch cloud subscription"
+    "message": "Bulud abunəliyini başlat"
  },
  "storage": {
    "message": "Saxlama"
@@ -4212,10 +4212,10 @@
    }
  },
  "userAcceptedTransfer": {
-    "message": "Accepted transfer to organization ownership."
+    "message": "Təşkilatın sahibliyinə ötürülmə qəbul edildi."
  },
  "userDeclinedTransfer": {
-    "message": "Revoked for declining transfer to organization ownership."
+    "message": "Təşkilatın sahibliyinə ötürülməyə rədd cavabı verildiyi üçün ləğv edildi."
  },
  "invitedUserId": {
    "message": "$ID$ istifadəçisi dəvət edildi.",
@@ -5871,7 +5871,7 @@
    "description": "This is the policy description shown in the policy list."
  },
  "organizationDataOwnershipDescContent": {
-    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will be available for each member to store items. Learn more about managing the ",
+    "message": "Bütün elementlər bir təşkilata məxsus olacaq və orada saxlanılacaq, bu da təşkilat üzrə kontrollar, görünürlük və hesabatları mümkün edəcək. İşə salındığı zaman, hər üzv üçün elementləri saxlaya biləcəyi ilkin bir kolleksiya mövcud olacaq. Daha ətraflı ",
    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection will be available for each member to store items. Learn more about managing the credential lifecycle.'"
  },
  "organizationDataOwnershipContentAnchor": {
@@ -6752,16 +6752,16 @@
    "message": "Bütün üzvlər üçün maksimum bitmə vaxtını \"Heç vaxt\" olaraq icazə vermək istədiyinizə əminsiniz?"
  },
  "sessionTimeoutConfirmationNeverDescription": {
-    "message": "This option will save your members' encryption keys on their devices. If you choose this option, ensure that their devices are adequately protected."
+    "message": "Bu seçim, üzvlərinizin şifrələmə açarlarını onların cihazlarında saxlayacaq. Bu seçimi seçsəniz, onların cihazlarının lazımi səviyyədə qorunduğuna əmin olun."
  },
  "learnMoreAboutDeviceProtection": {
    "message": "Cihaz mühafizəsi barədə daha ətraflı"
  },
  "sessionTimeoutConfirmationOnSystemLockTitle": {
-    "message": "\"System lock\" will only apply to the browser and desktop app"
+    "message": "\"Sistem kilidi\", yalnız brauzer və masaüstü tətbiqi üçün qüvvəyə minəcək"
  },
  "sessionTimeoutConfirmationOnSystemLockDescription": {
-    "message": "The mobile and web app will use \"on app restart\" as their maximum allowed timeout, since the option is not supported."
+    "message": "Mobil və veb tətbiqi, dəstəklənməyən bir seçim olduğu üçün icazə verilən maksimum bitmə vaxtı olaraq \"tətbiq başladılanda\"nı istifadə edəcək. "
  },
  "vaultTimeoutPolicyInEffect": {
    "message": "Təşkilatınızın siyasətləri, icazə verilən maksimum seyf bitmə vaxtını $HOURS$ saat $MINUTES$ dəqiqə olaraq ayarladı.",
@@ -9905,11 +9905,11 @@
    "description": "An option for the offboarding survey shown when a user cancels their subscription."
  },
  "switchToFreePlan": {
-    "message": "Switching to free plan",
+    "message": "Ödənişsiz plana keçilir",
    "description": "An option for the offboarding survey shown when a user cancels their subscription."
  },
  "switchToFreeOrg": {
-    "message": "Switching to free organization",
+    "message": "Ödənişsiz təşkilata keçilir",
    "description": "An option for the offboarding survey shown when a user cancels their subscription."
  },
  "freeForOneYear": {
@@ -9943,7 +9943,7 @@
    "message": "Tapşırıq təyin et"
  },
  "assignSecurityTasksToMembers": {
-    "message": "Send notifications to change passwords"
+    "message": "Parol dəyişdirmə bildirişlərini göndər"
  },
  "assignToCollections": {
    "message": "Kolleksiyalara təyin et"
@@ -12208,13 +12208,13 @@
    "message": "Ödənişsiz Ailələr sınağını başlat"
  },
  "blockClaimedDomainAccountCreation": {
-    "message": "Block account creation for claimed domains"
+    "message": "Götürülmüş domenlər üçün hesab yaradılmasını əngəllə"
  },
  "blockClaimedDomainAccountCreationDesc": {
-    "message": "Prevent users from creating accounts outside of your organization using email addresses from claimed domains."
+    "message": "İstifadəçilərin, götürülmüş domenlərə aid e-poçt ünvanlarını istifadə edərək təşkilatınızın xaricində hesab yaratmasını önləyin."
  },
  "blockClaimedDomainAccountCreationPrerequisite": {
-    "message": "A domain must be claimed before activating this policy."
+    "message": "Bu siyasət aktivləşdirilməzdən əvvəl bir domen götürülməlidir."
  },
  "unlockMethodNeededToChangeTimeoutActionDesc": {
    "message": "Seyf vaxt bitmə əməliyyatınızı dəyişdirmək üçün bir kilid açma üsulu qurun."
@@ -12433,13 +12433,13 @@
    "message": "Bunu niyə görürəm?"
  },
  "youHaveBitwardenPremium": {
-    "message": "You have Bitwarden Premium"
+    "message": "Sizdə Bitwarden Premium var"
  },
  "viewAndManagePremiumSubscription": {
-    "message": "View and manage your Premium subscription"
+    "message": "Premium abunəliyinizi görün və idarə edin"
  },
  "youNeedToUpdateLicenseFile": {
-    "message": "You'll need to update your license file"
+    "message": "Lisenziya faylınızı güncəlləməlisiniz"
  },
  "youNeedToUpdateLicenseFileDate": {
    "message": "$DATE$.",
@@ -12451,16 +12451,16 @@
    }
  },
  "uploadLicenseFile": {
-    "message": "Upload license file"
+    "message": "Lisenziya faylını yüklə"
  },
  "uploadYourLicenseFile": {
-    "message": "Upload your license file"
+    "message": "Lisenziya faylınızı yükləyin"
  },
  "uploadYourPremiumLicenseFile": {
-    "message": "Upload your Premium license file"
+    "message": "Premium lisenziya faylınızı yükləyin"
  },
  "uploadLicenseFileDesc": {
-    "message": "Your license file name will be similar to: $FILE_NAME$",
+    "message": "Lisenziya faylınızın adı $FILE_NAME$ faylı ilə oxşardır",
    "placeholders": {
      "file_name": {
        "content": "$1",
@@ -12469,15 +12469,15 @@
    }
  },
  "alreadyHaveSubscriptionQuestion": {
-    "message": "Already have a subscription?"
+    "message": "Artıq abunəliyiniz var?"
  },
  "alreadyHaveSubscriptionSelfHostedMessage": {
-    "message": "Open the subscription page on your Bitwarden cloud account and download your license file. Then return to this screen and upload it below."
+    "message": "Bitwarden bulud hesabınızdakı abunəlik səhifəsini açın və lisenziya faylınızı endirin. Sonra bu ekrana qayıdın və aşağıda yükləyin."
  },
  "viewAllPlans": {
-    "message": "View all plans"
+    "message": "Bütün planlara bax"
  },
  "planDescPremium": {
-    "message": "Complete online security"
+    "message": "Tam onlayn təhlükəsizlik"
  }
 }
--- a/apps/web/src/locales/de/messages.json
+++ b/apps/web/src/locales/de/messages.json
@@ -3294,7 +3294,7 @@
    "message": "Cloud-Abonnement starten"
  },
  "launchCloudSubscriptionSentenceCase": {
-    "message": "Launch cloud subscription"
+    "message": "Cloud-Abonnement starten"
  },
  "storage": {
    "message": "Speicher"
@@ -12433,13 +12433,13 @@
    "message": "Warum wird mir das angezeigt?"
  },
  "youHaveBitwardenPremium": {
-    "message": "You have Bitwarden Premium"
+    "message": "Du hast Bitwarden Premium"
  },
  "viewAndManagePremiumSubscription": {
-    "message": "View and manage your Premium subscription"
+    "message": "Dein Premium-Abonnement anzeigen und verwalten"
  },
  "youNeedToUpdateLicenseFile": {
-    "message": "You'll need to update your license file"
+    "message": "Du musst deine Lizenzdatei aktualisieren"
  },
  "youNeedToUpdateLicenseFileDate": {
    "message": "$DATE$.",
@@ -12457,10 +12457,10 @@
    "message": "Lade deine Lizenzdatei hoch"
  },
  "uploadYourPremiumLicenseFile": {
-    "message": "Upload your Premium license file"
+    "message": "Lade deine Premium-Lizenzdatei hoch"
  },
  "uploadLicenseFileDesc": {
-    "message": "Your license file name will be similar to: $FILE_NAME$",
+    "message": "Dein Lizenzdateiname wird in etwa so aussehen: $FILE_NAME$",
    "placeholders": {
      "file_name": {
        "content": "$1",
@@ -12469,13 +12469,13 @@
    }
  },
  "alreadyHaveSubscriptionQuestion": {
-    "message": "Already have a subscription?"
+    "message": "Du hast bereits ein Abonnement?"
  },
  "alreadyHaveSubscriptionSelfHostedMessage": {
-    "message": "Open the subscription page on your Bitwarden cloud account and download your license file. Then return to this screen and upload it below."
+    "message": "Öffne die Abonnementseite in deinem Bitwarden Cloud-Konto und lade deine Lizenzdatei herunter. Gehe dann zu dieser Seite zurück und lade sie unten hoch."
  },
  "viewAllPlans": {
-    "message": "View all plans"
+    "message": "Alle Tarife anzeigen"
  },
  "planDescPremium": {
    "message": "Umfassende Online-Sicherheit"
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -2634,6 +2634,9 @@
  "key": {
    "message": "Key"
  },
+  "unnamedKey": {
+    "message": "Unnamed key"
+  },
  "twoStepAuthenticatorEnterCodeV2": {
    "message": "Verification code"
  },
@@ -12305,6 +12308,9 @@
  "userVerificationFailed": {
    "message": "User verification failed."
  },
+  "resizeSideNavigation": {
+    "message": "Resize side navigation"
+  },
  "recoveryDeleteCiphersTitle": {
    "message": "Delete unrecoverable vault items"
  },
--- a/apps/web/src/locales/hu/messages.json
+++ b/apps/web/src/locales/hu/messages.json
@@ -4212,10 +4212,10 @@
    }
  },
  "userAcceptedTransfer": {
-    "message": "Accepted transfer to organization ownership."
+    "message": "Az átruházás a szervezet tulajdonába elfogadásra került."
  },
  "userDeclinedTransfer": {
-    "message": "Revoked for declining transfer to organization ownership."
+    "message": "A szervezet tulajdonába átruházás visszavonásra került elutasítás miatt."
  },
  "invitedUserId": {
    "message": "$ID$ azonosítójú felhasználó meghívásra került.",
--- a/apps/web/src/locales/it/messages.json
+++ b/apps/web/src/locales/it/messages.json
@@ -1970,11 +1970,11 @@
    "message": "Le chiavi di cifratura dell'account sono uniche per ogni account utente Bitwarden, quindi non è possibile importare un'esportazione cifrata in un account diverso."
  },
  "exportNoun": {
-    "message": "Export",
+    "message": "Esporta",
    "description": "The noun form of the word Export"
  },
  "exportVerb": {
-    "message": "Export",
+    "message": "Esporta",
    "description": "The verb form of the word Export"
  },
  "exportFrom": {
@@ -2303,11 +2303,11 @@
    "message": "Strumenti"
  },
  "importNoun": {
-    "message": "Import",
+    "message": "Importa",
    "description": "The noun form of the word Import"
  },
  "importVerb": {
-    "message": "Import",
+    "message": "Importa",
    "description": "The verb form of the word Import"
  },
  "importData": {
@@ -3294,7 +3294,7 @@
    "message": "Avvia abbonamento cloud"
  },
  "launchCloudSubscriptionSentenceCase": {
-    "message": "Launch cloud subscription"
+    "message": "Avvia abbonamento cloud"
  },
  "storage": {
    "message": "Spazio di archiviazione"
@@ -4212,10 +4212,10 @@
    }
  },
  "userAcceptedTransfer": {
-    "message": "Accepted transfer to organization ownership."
+    "message": "Trasferimento di proprietà all'organizzazione accettato."
  },
  "userDeclinedTransfer": {
-    "message": "Revoked for declining transfer to organization ownership."
+    "message": "Revocato per il rifiuto di trasferimento di proprietà all'organizzazione."
  },
  "invitedUserId": {
    "message": "Utente $ID$ invitato.",
@@ -11607,7 +11607,7 @@
    "message": "Togli dall'archivio"
  },
  "unArchiveAndSave": {
-    "message": "Unarchive and save"
+    "message": "Togli dall'archivio e salva"
  },
  "itemsInArchive": {
    "message": "Elementi archiviati"
@@ -12251,43 +12251,43 @@
    }
  },
  "removeMasterPasswordForOrgUserKeyConnector": {
-    "message": "Your organization is no longer using master passwords to log into Bitwarden. To continue, verify the organization and domain."
+    "message": "La tua organizzazione non utilizza più le password principali per accedere a Bitwarden. Per continuare, verifica l'organizzazione e il dominio."
  },
  "continueWithLogIn": {
-    "message": "Continue with log in"
+    "message": "Accedi e continua"
  },
  "doNotContinue": {
-    "message": "Do not continue"
+    "message": "Non continuare"
  },
  "domain": {
-    "message": "Domain"
+    "message": "Dominio"
  },
  "keyConnectorDomainTooltip": {
-    "message": "This domain will store your account encryption keys, so make sure you trust it. If you're not sure, check with your admin."
+    "message": "Questo dominio memorizzerà le chiavi di crittografia del tuo account, quindi assicurati di impostarlo come affidabile. Se non hai la certezza che lo sia, verifica con l'amministratore."
  },
  "verifyYourOrganization": {
-    "message": "Verify your organization to log in"
+    "message": "Verifica la tua organizzazione per accedere"
  },
  "organizationVerified": {
-    "message": "Organization verified"
+    "message": "Organizzazione verificata"
  },
  "domainVerified": {
-    "message": "Domain verified"
+    "message": "Dominio verificato"
  },
  "leaveOrganizationContent": {
-    "message": "If you don't verify your organization, your access to the organization will be revoked."
+    "message": "Se non verifichi l'organizzazione, il tuo accesso sarà revocato."
  },
  "leaveNow": {
-    "message": "Leave now"
+    "message": "Abbandona"
  },
  "verifyYourDomainToLogin": {
-    "message": "Verify your domain to log in"
+    "message": "Verifica il tuo dominio per accedere"
  },
  "verifyYourDomainDescription": {
-    "message": "To continue with log in, verify this domain."
+    "message": "Per continuare con l'accesso, verifica questo dominio."
  },
  "confirmKeyConnectorOrganizationUserDescription": {
-    "message": "To continue with log in, verify the organization and domain."
+    "message": "Per continuare con l'accesso, verifica l'organizzazione e il dominio."
  },
  "confirmNoSelectedCriticalApplicationsTitle": {
    "message": "Non ci sono applicazioni contrassegnate come critiche"
@@ -12433,13 +12433,13 @@
    "message": "Perché vedo questo avviso?"
  },
  "youHaveBitwardenPremium": {
-    "message": "You have Bitwarden Premium"
+    "message": "Hai Bitwarden Premium"
  },
  "viewAndManagePremiumSubscription": {
-    "message": "View and manage your Premium subscription"
+    "message": "Visualizza e gestisci il tuo abbonamento Premium"
  },
  "youNeedToUpdateLicenseFile": {
-    "message": "You'll need to update your license file"
+    "message": "Dovrai aggiornare il tuo file di licenza"
  },
  "youNeedToUpdateLicenseFileDate": {
    "message": "$DATE$.",
@@ -12451,16 +12451,16 @@
    }
  },
  "uploadLicenseFile": {
-    "message": "Upload license file"
+    "message": "Carica il file di licenza"
  },
  "uploadYourLicenseFile": {
-    "message": "Upload your license file"
+    "message": "Carica il file di licenza"
  },
  "uploadYourPremiumLicenseFile": {
-    "message": "Upload your Premium license file"
+    "message": "Carica il tuo file di licenza Premium"
  },
  "uploadLicenseFileDesc": {
-    "message": "Your license file name will be similar to: $FILE_NAME$",
+    "message": "Il nome del file di licenza sarà simile a $FILE_NAME$",
    "placeholders": {
      "file_name": {
        "content": "$1",
@@ -12469,15 +12469,15 @@
    }
  },
  "alreadyHaveSubscriptionQuestion": {
-    "message": "Already have a subscription?"
+    "message": "Hai già un abbonamento?"
  },
  "alreadyHaveSubscriptionSelfHostedMessage": {
-    "message": "Open the subscription page on your Bitwarden cloud account and download your license file. Then return to this screen and upload it below."
+    "message": "Vai alla pagina degli abbonamenti del tuo account Bitwarden e scarica il file di licenza, poi torna a caricarlo qui."
  },
  "viewAllPlans": {
-    "message": "View all plans"
+    "message": "Visualizza tutti i piani"
  },
  "planDescPremium": {
-    "message": "Complete online security"
+    "message": "Sicurezza online completa"
  }
 }
--- a/apps/web/src/locales/lv/messages.json
+++ b/apps/web/src/locales/lv/messages.json
@@ -4212,10 +4212,10 @@
    }
  },
  "userAcceptedTransfer": {
-    "message": "Accepted transfer to organization ownership."
+    "message": "Pieņemta īpašumtiesību nodošana apvienībai."
  },
  "userDeclinedTransfer": {
-    "message": "Revoked for declining transfer to organization ownership."
+    "message": "Atsaukts īpašumtiesību nodošanas apvienībai noraidīšanas dēļ."
  },
  "invitedUserId": {
    "message": "Uzaicināts lietotājs $ID$.",
@@ -12460,7 +12460,7 @@
    "message": "Jāaugšupielādē sava Premium licences datne"
  },
  "uploadLicenseFileDesc": {
-    "message": "Your license file name will be similar to: $FILE_NAME$",
+    "message": "Licences datnes nosaukums būs līdzīgs šim: $FILE_NAME$",
    "placeholders": {
      "file_name": {
        "content": "$1",
@@ -12469,15 +12469,15 @@
    }
  },
  "alreadyHaveSubscriptionQuestion": {
-    "message": "Already have a subscription?"
+    "message": "Jau ir abonements?"
  },
  "alreadyHaveSubscriptionSelfHostedMessage": {
-    "message": "Open the subscription page on your Bitwarden cloud account and download your license file. Then return to this screen and upload it below."
+    "message": "Jāatver abonementu lapa Bitwarden mākoņa kontā un jālejupielādē licences datne. Tad jāatgriežas šajā skatā un zemāk jāaugšupielādē."
  },
  "viewAllPlans": {
-    "message": "View all plans"
+    "message": "Apskatīt visus plānus"
  },
  "planDescPremium": {
-    "message": "Complete online security"
+    "message": "Pilnīga drošība tiešsaistē"
  }
 }
--- a/apps/web/src/locales/pt_BR/messages.json
+++ b/apps/web/src/locales/pt_BR/messages.json
@@ -1943,7 +1943,7 @@
    "message": "Copiar UUID"
  },
  "errorRefreshingAccessToken": {
-    "message": "Erro de recarregamento do token de acesso"
+    "message": "Erro de Recarregamento do Token de Acesso"
  },
  "errorRefreshingAccessTokenDesc": {
    "message": "Nenhum token de atualização ou chave de API foi encontrado. Tente se desconectar e se conectar novamente."
@@ -3294,7 +3294,7 @@
    "message": "Iniciar Assinatura na Nuvem"
  },
  "launchCloudSubscriptionSentenceCase": {
-    "message": "Launch cloud subscription"
+    "message": "Executar assinatura na nuvem"
  },
  "storage": {
    "message": "Armazenamento"
@@ -4212,10 +4212,10 @@
    }
  },
  "userAcceptedTransfer": {
-    "message": "Accepted transfer to organization ownership."
+    "message": "Aceitou a transferência da propriedade da organização."
  },
  "userDeclinedTransfer": {
-    "message": "Revoked for declining transfer to organization ownership."
+    "message": "Não aceitou a transferência da propriedade da organização."
  },
  "invitedUserId": {
    "message": "Convidou o usuário $ID$.",
--- a/apps/web/src/locales/pt_PT/messages.json
+++ b/apps/web/src/locales/pt_PT/messages.json
@@ -4212,10 +4212,10 @@
    }
  },
  "userAcceptedTransfer": {
-    "message": "Accepted transfer to organization ownership."
+    "message": "Transferência para propriedade da organização aceite."
  },
  "userDeclinedTransfer": {
-    "message": "Revoked for declining transfer to organization ownership."
+    "message": "Revogado por recusa de transferência para propriedade da organização."
  },
  "invitedUserId": {
    "message": "Utilizador $ID$ convidado.",
--- a/apps/web/src/locales/sk/messages.json
+++ b/apps/web/src/locales/sk/messages.json
@@ -7583,10 +7583,10 @@
    "message": "Použiť možnosti subadresovania svojho poskytovateľa e-mailu."
  },
  "catchallEmail": {
-    "message": "Catch-all e-mail"
+    "message": "Doménový kôš"
  },
  "catchallEmailDesc": {
-    "message": "Použiť doručenú poštu typu catch-all nastavenú na doméne."
+    "message": "Použiť nastavený doménový kôš."
  },
  "useThisEmail": {
    "message": "Použiť tento e-mail"
--- a/apps/web/src/locales/zh_CN/messages.json
+++ b/apps/web/src/locales/zh_CN/messages.json
@@ -1970,11 +1970,11 @@
    "message": "每个 Bitwarden 用户账户的账户加密密钥都是唯一的，因此您无法将加密的导出导入到另一个账户。"
  },
  "exportNoun": {
-    "message": "Export",
+    "message": "导出",
    "description": "The noun form of the word Export"
  },
  "exportVerb": {
-    "message": "Export",
+    "message": "导出",
    "description": "The verb form of the word Export"
  },
  "exportFrom": {
@@ -2303,11 +2303,11 @@
    "message": "工具"
  },
  "importNoun": {
-    "message": "Import",
+    "message": "导入",
    "description": "The noun form of the word Import"
  },
  "importVerb": {
-    "message": "Import",
+    "message": "导入",
    "description": "The verb form of the word Import"
  },
  "importData": {
@@ -3294,7 +3294,7 @@
    "message": "启动云订阅"
  },
  "launchCloudSubscriptionSentenceCase": {
-    "message": "Launch cloud subscription"
+    "message": "启动云订阅"
  },
  "storage": {
    "message": "存储"
@@ -3862,7 +3862,7 @@
    "description": "Browser extension/addon"
  },
  "desktop": {
-    "message": "桌面版应用",
+    "message": "桌面端",
    "description": "Desktop app"
  },
  "webVault": {
@@ -4212,10 +4212,10 @@
    }
  },
  "userAcceptedTransfer": {
-    "message": "Accepted transfer to organization ownership."
+    "message": "接受了转移至组织所有权。"
  },
  "userDeclinedTransfer": {
-    "message": "Revoked for declining transfer to organization ownership."
+    "message": "因拒绝转移至组织所有权而被撤销。"
  },
  "invitedUserId": {
    "message": "邀请了用户 $ID$。",
@@ -5195,7 +5195,7 @@
    "message": "需要先修复您的密码库中的旧文件附件，然后才能轮换您账户的加密密钥。"
  },
  "itemsTransferred": {
-    "message": "项目已传输"
+    "message": "项目已转移"
  },
  "yourAccountsFingerprint": {
    "message": "您的账户指纹短语",
@@ -6825,7 +6825,7 @@
    "message": "密码库超时不在允许的范围内。"
  },
  "disableExport": {
-    "message": "移除导出"
+    "message": "禁用导出"
  },
  "disablePersonalVaultExportDescription": {
    "message": "不允许成员从个人密码库导出数据。"
@@ -12406,7 +12406,7 @@
    "message": "我该如何管理我的密码库？"
  },
  "transferItemsToOrganizationTitle": {
-    "message": "传输项目到 $ORGANIZATION$",
+    "message": "转移项目到 $ORGANIZATION$",
    "placeholders": {
      "organization": {
        "content": "$1",
@@ -12415,7 +12415,7 @@
    }
  },
  "transferItemsToOrganizationContent": {
-    "message": "出于安全和合规考虑，$ORGANIZATION$ 要求所有项目归组织所有。点击「接受」以传输您的项目的所有权。",
+    "message": "出于安全和合规考虑，$ORGANIZATION$ 要求所有项目归组织所有。点击「接受」以转移您的项目的所有权。",
    "placeholders": {
      "organization": {
        "content": "$1",
@@ -12424,7 +12424,7 @@
    }
  },
  "acceptTransfer": {
-    "message": "接受传输"
+    "message": "接受转移"
  },
  "declineAndLeave": {
    "message": "拒绝并退出"
@@ -12433,16 +12433,16 @@
    "message": "为什么我会看到这个？"
  },
  "youHaveBitwardenPremium": {
-    "message": "You have Bitwarden Premium"
+    "message": "您有 Bitwarden 高级版"
  },
  "viewAndManagePremiumSubscription": {
-    "message": "View and manage your Premium subscription"
+    "message": "查看和管理您的高级版订阅"
  },
  "youNeedToUpdateLicenseFile": {
-    "message": "You'll need to update your license file"
+    "message": "您需要更新您的许可证文件"
  },
  "youNeedToUpdateLicenseFileDate": {
-    "message": "$DATE$.",
+    "message": "$DATE$。",
    "placeholders": {
      "date": {
        "content": "$1",
@@ -12451,16 +12451,16 @@
    }
  },
  "uploadLicenseFile": {
-    "message": "Upload license file"
+    "message": "上传许可证文件"
  },
  "uploadYourLicenseFile": {
-    "message": "Upload your license file"
+    "message": "上传您的许可证文件"
  },
  "uploadYourPremiumLicenseFile": {
-    "message": "Upload your Premium license file"
+    "message": "上传您的高级版许可证文件"
  },
  "uploadLicenseFileDesc": {
-    "message": "Your license file name will be similar to: $FILE_NAME$",
+    "message": "您的许可证文件名将类似于：$FILE_NAME$",
    "placeholders": {
      "file_name": {
        "content": "$1",
@@ -12469,15 +12469,15 @@
    }
  },
  "alreadyHaveSubscriptionQuestion": {
-    "message": "Already have a subscription?"
+    "message": "已经有一个订阅了吗？"
  },
  "alreadyHaveSubscriptionSelfHostedMessage": {
-    "message": "Open the subscription page on your Bitwarden cloud account and download your license file. Then return to this screen and upload it below."
+    "message": "打开您的 Bitwarden 云账户中的订阅页面并下载您的许可证文件。然后返回此界面并在下方上传该文件。"
  },
  "viewAllPlans": {
-    "message": "View all plans"
+    "message": "查看所有方案"
  },
  "planDescPremium": {
-    "message": "Complete online security"
+    "message": "全面的在线安全防护"
  }
 }
--- a/apps/web/src/locales/zh_TW/messages.json
+++ b/apps/web/src/locales/zh_TW/messages.json
@@ -1970,11 +1970,11 @@
    "message": "每個 Bitwarden 使用者帳戶的帳戶加密金鑰都不相同，因此無法將已加密匯出的檔案匯入至不同帳戶中。"
  },
  "exportNoun": {
-    "message": "Export",
+    "message": "匯出",
    "description": "The noun form of the word Export"
  },
  "exportVerb": {
-    "message": "Export",
+    "message": "匯出",
    "description": "The verb form of the word Export"
  },
  "exportFrom": {
@@ -2303,11 +2303,11 @@
    "message": "工具"
  },
  "importNoun": {
-    "message": "Import",
+    "message": "匯入",
    "description": "The noun form of the word Import"
  },
  "importVerb": {
-    "message": "Import",
+    "message": "匯入",
    "description": "The verb form of the word Import"
  },
  "importData": {
@@ -3294,7 +3294,7 @@
    "message": "啟動雲端訂閱"
  },
  "launchCloudSubscriptionSentenceCase": {
-    "message": "Launch cloud subscription"
+    "message": "啟動雲端訂閱"
  },
  "storage": {
    "message": "儲存空間"
@@ -4212,10 +4212,10 @@
    }
  },
  "userAcceptedTransfer": {
-    "message": "Accepted transfer to organization ownership."
+    "message": "已接受轉移至組織擁有權。"
  },
  "userDeclinedTransfer": {
-    "message": "Revoked for declining transfer to organization ownership."
+    "message": "因拒絕轉移至組織擁有權而遭撤銷。"
  },
  "invitedUserId": {
    "message": "已邀請使用者 $ID$。",
@@ -5195,7 +5195,7 @@
    "message": "需要先修正密碼庫中舊的檔案附件，然後才能輪換帳戶的加密金鑰。"
  },
  "itemsTransferred": {
-    "message": "Items transferred"
+    "message": "項目已轉移"
  },
  "yourAccountsFingerprint": {
    "message": "您帳戶的指紋短語",
@@ -6825,7 +6825,7 @@
    "message": "密碼庫逾時時間不在允許的範圍內。"
  },
  "disableExport": {
-    "message": "Remove export"
+    "message": "移除匯出"
  },
  "disablePersonalVaultExportDescription": {
    "message": "不允許成員從其個人密碼庫匯出資料。"
@@ -9494,7 +9494,7 @@
    "message": "需要登入 SSO"
  },
  "emailRequiredForSsoLogin": {
-    "message": "Email is required for SSO"
+    "message": "使用 SSO 需要電子郵件"
  },
  "selectedRegionFlag": {
    "message": "選定的區域標記"
@@ -11607,7 +11607,7 @@
    "message": "取消封存"
  },
  "unArchiveAndSave": {
-    "message": "Unarchive and save"
+    "message": "取消封存並儲存"
  },
  "itemsInArchive": {
    "message": "封存中的項目"
@@ -12251,43 +12251,43 @@
    }
  },
  "removeMasterPasswordForOrgUserKeyConnector": {
-    "message": "Your organization is no longer using master passwords to log into Bitwarden. To continue, verify the organization and domain."
+    "message": "您的組織已不再使用主密碼登入 Bitwarden。若要繼續，請驗證組織與網域。"
  },
  "continueWithLogIn": {
-    "message": "Continue with log in"
+    "message": "繼續登入"
  },
  "doNotContinue": {
-    "message": "Do not continue"
+    "message": "不要繼續"
  },
  "domain": {
-    "message": "Domain"
+    "message": "網域"
  },
  "keyConnectorDomainTooltip": {
-    "message": "This domain will store your account encryption keys, so make sure you trust it. If you're not sure, check with your admin."
+    "message": "此網域將儲存您帳號的加密金鑰，請確認您信任它。若不確定，請洽詢您的管理員。"
  },
  "verifyYourOrganization": {
-    "message": "Verify your organization to log in"
+    "message": "驗證您的組織以登入"
  },
  "organizationVerified": {
-    "message": "Organization verified"
+    "message": "組織已驗證"
  },
  "domainVerified": {
-    "message": "Domain verified"
+    "message": "已驗證網域"
  },
  "leaveOrganizationContent": {
-    "message": "If you don't verify your organization, your access to the organization will be revoked."
+    "message": "若您未驗證組織，將會被撤銷對該組織的存取權限。"
  },
  "leaveNow": {
-    "message": "Leave now"
+    "message": "立即離開"
  },
  "verifyYourDomainToLogin": {
-    "message": "Verify your domain to log in"
+    "message": "驗證您的網域以登入"
  },
  "verifyYourDomainDescription": {
-    "message": "To continue with log in, verify this domain."
+    "message": "若要繼續登入，請驗證此網域。"
  },
  "confirmKeyConnectorOrganizationUserDescription": {
-    "message": "To continue with log in, verify the organization and domain."
+    "message": "若要繼續登入，請驗證組織與網域。"
  },
  "confirmNoSelectedCriticalApplicationsTitle": {
    "message": "未選取任何關鍵應用程式"
@@ -12299,52 +12299,52 @@
    "message": "使用者驗證失敗。"
  },
  "recoveryDeleteCiphersTitle": {
-    "message": "Delete unrecoverable vault items"
+    "message": "刪除無法復原的密碼庫項目"
  },
  "recoveryDeleteCiphersDesc": {
-    "message": "Some of your vault items could not be recovered. Do you want to delete these unrecoverable items from your vault?"
+    "message": "部分密碼庫項目無法復原。是否要從您的密碼庫中刪除這些無法復原的項目？"
  },
  "recoveryDeleteFoldersTitle": {
-    "message": "Delete unrecoverable folders"
+    "message": "刪除無法復原的資料夾"
  },
  "recoveryDeleteFoldersDesc": {
-    "message": "Some of your folders could not be recovered. Do you want to delete these unrecoverable folders from your vault?"
+    "message": "部分資料夾無法復原。是否要從您的密碼庫中刪除這些無法復原的資料夾？"
  },
  "recoveryReplacePrivateKeyTitle": {
-    "message": "Replace encryption key"
+    "message": "更換加密金鑰"
  },
  "recoveryReplacePrivateKeyDesc": {
-    "message": "Your public-key encryption key pair could not be recovered. Do you want to replace your encryption key with a new key pair? This will require you to set up existing emergency-access and organization memberships again."
+    "message": "您的公開金鑰加密金鑰組無法復原。是否要以新的金鑰組取代目前的加密金鑰？這將需要您重新設定現有的緊急存取與組織成員資格。"
  },
  "recoveryStepSyncTitle": {
-    "message": "Synchronizing data"
+    "message": "正在同步資料"
  },
  "recoveryStepPrivateKeyTitle": {
-    "message": "Verifying encryption key integrity"
+    "message": "正在驗證加密金鑰完整性"
  },
  "recoveryStepUserInfoTitle": {
-    "message": "Verifying user information"
+    "message": "正在驗證使用者資訊"
  },
  "recoveryStepCipherTitle": {
-    "message": "Verifying vault item integrity"
+    "message": "正在驗證密碼庫項目完整性"
  },
  "recoveryStepFoldersTitle": {
-    "message": "Verifying folder integrity"
+    "message": "正在驗證資料夾完整性"
  },
  "dataRecoveryTitle": {
-    "message": "Data Recovery and Diagnostics"
+    "message": "資料復原與診斷"
  },
  "dataRecoveryDescription": {
-    "message": "Use the data recovery tool to diagnose and repair issues with your account. After running diagnostics you have the option to save diagnostic logs for support and the option to repair any detected issues."
+    "message": "使用資料復原工具來診斷並修復您帳號的問題。完成診斷後，您可以選擇儲存診斷記錄以供支援使用，並修復任何偵測到的問題。"
  },
  "runDiagnostics": {
-    "message": "Run Diagnostics"
+    "message": "執行診斷"
  },
  "repairIssues": {
-    "message": "Repair Issues"
+    "message": "修復問題"
  },
  "saveDiagnosticLogs": {
-    "message": "Save Diagnostic Logs"
+    "message": "儲存診斷記錄"
  },
  "sessionTimeoutSettingsManagedByOrganization": {
    "message": "此設定由您的組織管理。"
@@ -12385,16 +12385,16 @@
    "message": "設定一個解鎖方式來變更您的密碼庫逾時動作。"
  },
  "leaveConfirmationDialogTitle": {
-    "message": "Are you sure you want to leave?"
+    "message": "確定要離開嗎？"
  },
  "leaveConfirmationDialogContentOne": {
-    "message": "By declining, your personal items will stay in your account, but you'll lose access to shared items and organization features."
+    "message": "若選擇拒絕，您的個人項目將保留在帳號中，但您將失去對共用項目與組織功能的存取權。"
  },
  "leaveConfirmationDialogContentTwo": {
-    "message": "Contact your admin to regain access."
+    "message": "請聯絡您的管理員以重新取得存取權限。"
  },
  "leaveConfirmationDialogConfirmButton": {
-    "message": "Leave $ORGANIZATION$",
+    "message": "離開 $ORGANIZATION$",
    "placeholders": {
      "organization": {
        "content": "$1",
@@ -12403,10 +12403,10 @@
    }
  },
  "howToManageMyVault": {
-    "message": "How do I manage my vault?"
+    "message": "我要如何管理我的密碼庫？"
  },
  "transferItemsToOrganizationTitle": {
-    "message": "Transfer items to $ORGANIZATION$",
+    "message": "將項目轉移至 $ORGANIZATION$",
    "placeholders": {
      "organization": {
        "content": "$1",
@@ -12415,7 +12415,7 @@
    }
  },
  "transferItemsToOrganizationContent": {
-    "message": "$ORGANIZATION$ is requiring all items to be owned by the organization for security and compliance. Click accept to transfer ownership of your items.",
+    "message": "$ORGANIZATION$ 為了安全性與合規性，要求所有項目皆由組織擁有。點擊接受即可轉移您項目的擁有權。",
    "placeholders": {
      "organization": {
        "content": "$1",
@@ -12424,25 +12424,25 @@
    }
  },
  "acceptTransfer": {
-    "message": "Accept transfer"
+    "message": "同意轉移"
  },
  "declineAndLeave": {
-    "message": "Decline and leave"
+    "message": "拒絕並離開"
  },
  "whyAmISeeingThis": {
-    "message": "Why am I seeing this?"
+    "message": "為什麼我會看到此訊息？"
  },
  "youHaveBitwardenPremium": {
-    "message": "You have Bitwarden Premium"
+    "message": "您已擁有 Bitwarden 進階版"
  },
  "viewAndManagePremiumSubscription": {
-    "message": "View and manage your Premium subscription"
+    "message": "檢視並管理您的進階版訂閱"
  },
  "youNeedToUpdateLicenseFile": {
-    "message": "You'll need to update your license file"
+    "message": "您需要更新您的授權檔案"
  },
  "youNeedToUpdateLicenseFileDate": {
-    "message": "$DATE$.",
+    "message": "$DATE$。",
    "placeholders": {
      "date": {
        "content": "$1",
@@ -12451,16 +12451,16 @@
    }
  },
  "uploadLicenseFile": {
-    "message": "Upload license file"
+    "message": "上傳授權檔案"
  },
  "uploadYourLicenseFile": {
-    "message": "Upload your license file"
+    "message": "上傳您的授權檔案"
  },
  "uploadYourPremiumLicenseFile": {
-    "message": "Upload your Premium license file"
+    "message": "上傳您的進階版授權檔案"
  },
  "uploadLicenseFileDesc": {
-    "message": "Your license file name will be similar to: $FILE_NAME$",
+    "message": "您的授權檔案名稱將類似於：$FILE_NAME$",
    "placeholders": {
      "file_name": {
        "content": "$1",
@@ -12469,15 +12469,15 @@
    }
  },
  "alreadyHaveSubscriptionQuestion": {
-    "message": "Already have a subscription?"
+    "message": "已經有訂閱了嗎？"
  },
  "alreadyHaveSubscriptionSelfHostedMessage": {
-    "message": "Open the subscription page on your Bitwarden cloud account and download your license file. Then return to this screen and upload it below."
+    "message": "請在您的 Bitwarden 雲端帳號中開啟訂閱頁面並下載授權檔案，接著返回此畫面並於下方上傳。"
  },
  "viewAllPlans": {
-    "message": "View all plans"
+    "message": "查看所有方案"
  },
  "planDescPremium": {
-    "message": "Complete online security"
+    "message": "完整的線上安全防護"
  }
 }