diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8c33997b..892206e6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -76,17 +76,15 @@ jobs:
     env:
       _VERSION: ${{ needs.setup.outputs.version }}
     steps:
-      - name: Set up Node
-        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
-        with:
-          node-version: "16"
+      - name: Checkout repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
-      - name: Cache npm
-        id: npm-cache
-        uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353  # v2.1.6
+      - name: Set up Node
+        uses: actions/setup-node@9ced9a43a244f3ac94f13bfd896db8c8f30da67a  # v3.0.0
         with:
-          path: "~/.npm"
-          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
+          node-version: "16"
 
       - name: Print environment
         run: |
@@ -98,9 +96,6 @@ jobs:
           echo "GitHub ref: $GITHUB_REF"
           echo "GitHub event: $GITHUB_EVENT"
 
-      - name: Checkout repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
-
       - name: Install dependencies
         run: npm ci
 
@@ -126,17 +121,15 @@ jobs:
     env:
       _VERSION: ${{ needs.setup.outputs.version }}
     steps:
-      - name: Set up Node
-        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
-        with:
-          node-version: "16"
+      - name: Checkout repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
-      - name: Cache npm
-        id: npm-cache
-        uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353  # v2.1.6
+      - name: Set up Node
+        uses: actions/setup-node@9ced9a43a244f3ac94f13bfd896db8c8f30da67a  # v3.0.0
         with:
-          path: "~/.npm"
-          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
+          node-version: "16"
 
       - name: Print environment
         run: |
@@ -148,9 +141,6 @@ jobs:
           echo "GitHub ref: $GITHUB_REF"
           echo "GitHub event: $GITHUB_EVENT"
 
-      - name: Checkout repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
-
       - name: Install dependencies
         run: npm ci
 
@@ -176,17 +166,15 @@ jobs:
     env:
       _VERSION: ${{ needs.setup.outputs.version }}
     steps:
-      - name: Set up Node
-        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
-        with:
-          node-version: "16"
+      - name: Checkout repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
-      - name: Cache npm
-        id: npm-cache
-        uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353  # v2.1.6
+      - name: Set up Node
+        uses: actions/setup-node@9ced9a43a244f3ac94f13bfd896db8c8f30da67a  # v3.0.0
         with:
-          path: "~/.npm"
-          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
+          node-version: "16"
 
       - name: Print environment
         run: |
@@ -199,16 +187,13 @@ jobs:
           echo "GitHub event: $GITHUB_EVENT"
 
       - name: Setup DCT
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix'
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix-rc'
         id: setup-dct
         uses: bitwarden/gh-actions/setup-docker-trust@a8c384a05a974c05c48374c818b004be221d43ff
         with:
           azure-creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
           azure-keyvault-name: "bitwarden-prod-kv"
 
-      - name: Checkout repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
-
       - name: Install dependencies
         run: npm ci
 
@@ -243,11 +228,11 @@ jobs:
         run: docker tag bitwarden/web bitwarden/web:dev
 
       - name: Tag hotfix branch
-        if: github.ref == 'refs/heads/hotfix'
-        run: docker tag bitwarden/web bitwarden/web:hotfix
+        if: github.ref == 'refs/heads/hotfix-rc'
+        run: docker tag bitwarden/web bitwarden/web:hotfix-rc
 
       - name: List Docker images
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix'
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix-rc'
         run: docker images
 
       - name: Push rc image
@@ -265,14 +250,14 @@ jobs:
           DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE: ${{ steps.setup-dct.outputs.dct-delegate-repo-passphrase }}
 
       - name: Push hotfix image
-        if: github.ref == 'refs/heads/hotfix'
-        run: docker push bitwarden/web:hotfix
+        if: github.ref == 'refs/heads/hotfix-rc'
+        run: docker push bitwarden/web:hotfix-rc
         env:
           DOCKER_CONTENT_TRUST: 1
           DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE: ${{ steps.setup-dct.outputs.dct-delegate-repo-passphrase }}
 
       - name: Log out of Docker
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix'
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix-rc'
         run: |
           docker logout
           echo "DOCKER_CONTENT_TRUST=0" >> $GITHUB_ENV
@@ -308,17 +293,15 @@ jobs:
       - setup
       - lint
     steps:
-      - name: Set up Node
-        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
-        with:
-          node-version: "16"
+      - name: Checkout repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
-      - name: Cache npm
-        id: npm-cache
-        uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353  # v2.1.6
+      - name: Set up Node
+        uses: actions/setup-node@9ced9a43a244f3ac94f13bfd896db8c8f30da67a  # v3.0.0
         with:
-          path: "~/.npm"
-          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
+          node-version: "16"
 
       - name: Print environment
         run: |
@@ -338,9 +321,6 @@ jobs:
       - name: Log into container registry
         run: az acr login -n bitwardenqa
 
-      - name: Checkout repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
-
       - name: Install dependencies
         run: npm ci
 
@@ -401,21 +381,19 @@ jobs:
     name: Test code on Windows
     runs-on: windows-2019
     steps:
+      - name: Checkout repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+
       - name: Set up NuGet
         uses: nuget/setup-nuget@04b0c2b8d1b97922f67eca497d7cf0bf17b8ffe1
         with:
           nuget-version: "latest"
 
-      - name: Cache npm
-        id: npm-cache
-        uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353  # v2.1.6
-        with:
-          path: "~/.npm"
-          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
-
       - name: Set up Node
-        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
+        uses: actions/setup-node@9ced9a43a244f3ac94f13bfd896db8c8f30da67a  # v3.0.0
         with:
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
           node-version: "16"
 
       - name: Print environment
@@ -429,9 +407,6 @@ jobs:
           GITHUB_REF: ${{ github.ref }}
           GITHUB_EVENT: ${{ github.event_name }}
 
-      - name: Checkout repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
-
       - name: Install dependencies
         run: npm ci
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a791306e..ba101fc4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,9 +26,9 @@ jobs:
       - name: Branch check
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
         run: |
-          if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ "$GITHUB_REF" != "refs/heads/hotfix" ]]; then
+          if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ "$GITHUB_REF" != "refs/heads/hotfix-rc" ]]; then
             echo "==================================="
-            echo "[!] Can only release from the 'rc' or 'hotfix' branches"
+            echo "[!] Can only release from the 'rc' or 'hotfix-rc' branches"
             echo "==================================="
             exit 1
           fi
diff --git a/SECURITY.md b/SECURITY.md
index 7a055501..e6edb96d 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,39 +1,11 @@
-Bitwarden believes that working with security researchers across the globe is crucial to keeping our
-users safe. If you believe you've found a security issue in our product or service, we encourage you to
-notify us. We welcome working with you to resolve the issue promptly. Thanks in advance!
+Bitwarden believes that working with security researchers across the globe is crucial to keeping our users safe. If you believe you've found a security issue in our product or service, we encourage you to please submit a report through our [HackerOne Program](https://hackerone.com/bitwarden/). We welcome working with you to resolve the issue promptly. Thanks in advance!
 
 # Disclosure Policy
 
-- Let us know as soon as possible upon discovery of a potential security issue, and we'll make every
-  effort to quickly resolve the issue.
-- Provide us a reasonable amount of time to resolve the issue before any disclosure to the public or a
-  third-party. We may publicly disclose the issue before resolving it, if appropriate.
-- Make a good faith effort to avoid privacy violations, destruction of data, and interruption or
-  degradation of our service. Only interact with accounts you own or with explicit permission of the
-  account holder.
-- If you would like to encrypt your report, please use the PGP key with long ID
-  `0xDE6887086F892325FEC04CC0D847525B6931381F` (available in the public keyserver pool).
-
-# In-scope
-
-- Security issues in any current release of Bitwarden. This includes the web vault, browser extension,
-  and mobile apps (iOS and Android). Product downloads are available at https://bitwarden.com. Source
-  code is available at https://github.com/bitwarden.
-
-# Exclusions
-
-The following bug classes are out-of scope:
-
-- Bugs that are already reported on any of Bitwarden's issue trackers (https://github.com/bitwarden),
-  or that we already know of. Note that some of our issue tracking is private.
-- Issues in an upstream software dependency (ex: Xamarin, ASP.NET) which are already reported to the
-  upstream maintainer.
-- Attacks requiring physical access to a user's device.
-- Self-XSS
-- Issues related to software or protocols not under Bitwarden's control
-- Vulnerabilities in outdated versions of Bitwarden
-- Missing security best practices that do not directly lead to a vulnerability
-- Issues that do not have any impact on the general public
+- Let us know as soon as possible upon discovery of a potential security issue, and we'll make every effort to quickly resolve the issue.
+- Provide us a reasonable amount of time to resolve the issue before any disclosure to the public or a third-party. We may publicly disclose the issue before resolving it, if appropriate.
+- Make a good faith effort to avoid privacy violations, destruction of data, and interruption or degradation of our service. Only interact with accounts you own or with explicit permission of the account holder.
+- If you would like to encrypt your report, please use the PGP key with long ID `0xDE6887086F892325FEC04CC0D847525B6931381F` (available in the public keyserver pool).
 
 While researching, we'd like to ask you to refrain from:
 
@@ -42,4 +14,8 @@ While researching, we'd like to ask you to refrain from:
 - Social engineering (including phishing) of Bitwarden staff or contractors
 - Any physical attempts against Bitwarden property or data centers
 
+# We want to help you!
+
+If you have something that you feel is close to exploitation, or if you'd like some information regarding the internal API, or generally have any questions regarding the app that would help in your efforts, please email us at https://bitwarden.com/contact and ask for that information. As stated above, Bitwarden wants to help you find issues, and is more than willing to help.
+
 Thank you for helping keep Bitwarden and our users safe!
diff --git a/bitwarden_license/src/app/app.module.ts b/bitwarden_license/src/app/app.module.ts
index 7fe8de44..9e0de2af 100644
--- a/bitwarden_license/src/app/app.module.ts
+++ b/bitwarden_license/src/app/app.module.ts
@@ -5,10 +5,9 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 import { RouterModule } from "@angular/router";
 import { InfiniteScrollModule } from "ngx-infinite-scroll";
 
-import { BitwardenToastModule } from "jslib-angular/components/toastr.component";
+import { JslibModule } from "jslib-angular/jslib.module";
 
 import { OssRoutingModule } from "src/app/oss-routing.module";
-import { OssModule } from "src/app/oss.module";
 import { ServicesModule } from "src/app/services/services.module";
 import { WildcardRoutingModule } from "src/app/wildcard-routing.module";
 
@@ -20,28 +19,23 @@ import { MaximumVaultTimeoutPolicyComponent } from "./policies/maximum-vault-tim
 
 @NgModule({
   imports: [
-    OssModule,
-    BrowserAnimationsModule,
-    FormsModule,
-    ReactiveFormsModule,
-    ServicesModule,
-    BitwardenToastModule.forRoot({
-      maxOpened: 5,
-      autoDismiss: true,
-      closeButton: true,
-    }),
-    InfiniteScrollModule,
-    DragDropModule,
     AppRoutingModule,
-    OssRoutingModule,
+    BrowserAnimationsModule,
+    DragDropModule,
+    FormsModule,
+    InfiniteScrollModule,
+    JslibModule,
     OrganizationsModule,
+    OssRoutingModule,
+    ReactiveFormsModule,
     RouterModule,
+    ServicesModule,
     WildcardRoutingModule, // Needs to be last to catch all non-existing routes
   ],
   declarations: [
     AppComponent,
-    MaximumVaultTimeoutPolicyComponent,
     DisablePersonalVaultExportPolicyComponent,
+    MaximumVaultTimeoutPolicyComponent,
   ],
   bootstrap: [AppComponent],
 })
diff --git a/bitwarden_license/src/app/organizations/organizations.module.ts b/bitwarden_license/src/app/organizations/organizations.module.ts
index 838e8d4b..f67a9b7e 100644
--- a/bitwarden_license/src/app/organizations/organizations.module.ts
+++ b/bitwarden_license/src/app/organizations/organizations.module.ts
@@ -2,7 +2,7 @@ import { CommonModule } from "@angular/common";
 import { NgModule } from "@angular/core";
 import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 
-import { OssModule } from "src/app/oss.module";
+import { JslibModule } from "jslib-angular/jslib.module";
 
 import { InputCheckboxComponent } from "./components/input-checkbox.component";
 import { InputTextReadOnlyComponent } from "./components/input-text-readonly.component";
@@ -14,7 +14,13 @@ import { OrganizationsRoutingModule } from "./organizations-routing.module";
 // Form components are for use in the SSO Configuration Form only and should not be exported for use elsewhere.
 // They will be deprecated by the Component Library.
 @NgModule({
-  imports: [CommonModule, FormsModule, ReactiveFormsModule, OssModule, OrganizationsRoutingModule],
+  imports: [
+    CommonModule,
+    FormsModule,
+    ReactiveFormsModule,
+    JslibModule,
+    OrganizationsRoutingModule,
+  ],
   declarations: [
     InputCheckboxComponent,
     InputTextComponent,
diff --git a/bitwarden_license/src/app/providers/providers.module.ts b/bitwarden_license/src/app/providers/providers.module.ts
index 653cd0b2..9f762cf4 100644
--- a/bitwarden_license/src/app/providers/providers.module.ts
+++ b/bitwarden_license/src/app/providers/providers.module.ts
@@ -2,6 +2,7 @@ import { CommonModule } from "@angular/common";
 import { ComponentFactoryResolver, NgModule } from "@angular/core";
 import { FormsModule } from "@angular/forms";
 
+import { JslibModule } from "jslib-angular/jslib.module";
 import { ModalService } from "jslib-angular/services/modal.service";
 
 import { OssModule } from "src/app/oss.module";
@@ -27,7 +28,7 @@ import { SetupProviderComponent } from "./setup/setup-provider.component";
 import { SetupComponent } from "./setup/setup.component";
 
 @NgModule({
-  imports: [CommonModule, FormsModule, OssModule, ProvidersRoutingModule],
+  imports: [CommonModule, FormsModule, OssModule, JslibModule, ProvidersRoutingModule],
   declarations: [
     AcceptProviderComponent,
     AccountComponent,
diff --git a/jslib b/jslib
index 41b199ab..9950fb42 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 41b199ab831eff8d197e006328274dbf8b1b11bd
+Subproject commit 9950fb42a15bad434a4b404419ff4a87af67a27b
diff --git a/package-lock.json b/package-lock.json
index 5c29e224..8c57f774 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@bitwarden/web-vault",
-  "version": "2.26.2",
+  "version": "2.27.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@bitwarden/web-vault",
-      "version": "2.26.2",
+      "version": "2.27.0",
       "hasInstallScript": true,
       "license": "GPL-3.0",
       "dependencies": {
diff --git a/package.json b/package.json
index 34fbe402..8642dcf7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bitwarden/web-vault",
-  "version": "2.26.2",
+  "version": "2.27.0",
   "license": "GPL-3.0",
   "repository": "https://github.com/bitwarden/web",
   "scripts": {
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index b9471004..cd94408f 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -197,6 +197,8 @@ export class AppComponent implements OnDestroy, OnInit {
       new SendOptionsPolicy(),
       new ResetPasswordPolicy(),
     ]);
+
+    this.setFullWidth();
   }
 
   ngOnDestroy() {
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index c28278f7..15d5a190 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -4,8 +4,6 @@ import { FormsModule } from "@angular/forms";
 import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 import { InfiniteScrollModule } from "ngx-infinite-scroll";
 
-import { BitwardenToastModule } from "jslib-angular/components/toastr.component";
-
 import { AppComponent } from "./app.component";
 import { OssRoutingModule } from "./oss-routing.module";
 import { OssModule } from "./oss.module";
@@ -18,11 +16,6 @@ import { WildcardRoutingModule } from "./wildcard-routing.module";
     BrowserAnimationsModule,
     FormsModule,
     ServicesModule,
-    BitwardenToastModule.forRoot({
-      maxOpened: 5,
-      autoDismiss: true,
-      closeButton: true,
-    }),
     InfiniteScrollModule,
     DragDropModule,
     OssRoutingModule,
diff --git a/src/app/oss.module.ts b/src/app/oss.module.ts
index 9f17cb8c..90596adf 100644
--- a/src/app/oss.module.ts
+++ b/src/app/oss.module.ts
@@ -57,30 +57,8 @@ import { BadgeModule, ButtonModule, CalloutModule } from "@bitwarden/components"
 import { InfiniteScrollModule } from "ngx-infinite-scroll";
 import { ToastrModule } from "ngx-toastr";
 
-import { AvatarComponent } from "jslib-angular/components/avatar.component";
-import { CalloutComponent } from "jslib-angular/components/callout.component";
-import { ExportScopeCalloutComponent } from "jslib-angular/components/export-scope-callout.component";
-import { IconComponent } from "jslib-angular/components/icon.component";
-import { VerifyMasterPasswordComponent } from "jslib-angular/components/verify-master-password.component";
-import { A11yInvalidDirective } from "jslib-angular/directives/a11y-invalid.directive";
-import { A11yTitleDirective } from "jslib-angular/directives/a11y-title.directive";
-import { ApiActionDirective } from "jslib-angular/directives/api-action.directive";
-import { AutofocusDirective } from "jslib-angular/directives/autofocus.directive";
-import { BlurClickDirective } from "jslib-angular/directives/blur-click.directive";
-import { BoxRowDirective } from "jslib-angular/directives/box-row.directive";
-import { FallbackSrcDirective } from "jslib-angular/directives/fallback-src.directive";
-import { InputStripSpacesDirective } from "jslib-angular/directives/input-strip-spaces.directive";
-import { InputVerbatimDirective } from "jslib-angular/directives/input-verbatim.directive";
 import { NotPremiumDirective } from "jslib-angular/directives/not-premium.directive";
-import { SelectCopyDirective } from "jslib-angular/directives/select-copy.directive";
-import { StopClickDirective } from "jslib-angular/directives/stop-click.directive";
-import { StopPropDirective } from "jslib-angular/directives/stop-prop.directive";
-import { TrueFalseValueDirective } from "jslib-angular/directives/true-false-value.directive";
-import { ColorPasswordPipe } from "jslib-angular/pipes/color-password.pipe";
-import { I18nPipe } from "jslib-angular/pipes/i18n.pipe";
-import { SearchCiphersPipe } from "jslib-angular/pipes/search-ciphers.pipe";
-import { SearchPipe } from "jslib-angular/pipes/search.pipe";
-import { UserNamePipe } from "jslib-angular/pipes/user-name.pipe";
+import { JslibModule } from "jslib-angular/jslib.module";
 
 import { AcceptEmergencyComponent } from "./accounts/accept-emergency.component";
 import { AcceptOrganizationComponent } from "./accounts/accept-organization.component";
@@ -291,19 +269,18 @@ registerLocaleData(localeZhTw, "zh-TW");
 @NgModule({
   imports: [
     CommonModule,
+    DragDropModule,
     FormsModule,
     InfiniteScrollModule,
-    DragDropModule,
-    ToastrModule,
+    JslibModule,
     ReactiveFormsModule,
     RouterModule,
     BadgeModule,
     ButtonModule,
     CalloutModule,
+    ToastrModule,
   ],
   declarations: [
-    A11yInvalidDirective,
-    A11yTitleDirective,
     AcceptEmergencyComponent,
     AcceptOrganizationComponent,
     AccessComponent,
@@ -315,27 +292,20 @@ registerLocaleData(localeZhTw, "zh-TW");
     AdjustPaymentComponent,
     AdjustStorageComponent,
     AdjustSubscription,
-    ApiActionDirective,
     ApiKeyComponent,
     AttachmentsComponent,
-    AutofocusDirective,
-    AvatarComponent,
-    BlurClickDirective,
-    BoxRowDirective,
     BreachReportComponent,
     BulkActionsComponent,
     BulkDeleteComponent,
     BulkMoveComponent,
     BulkRestoreComponent,
     BulkShareComponent,
-    CalloutComponent,
     ChangeEmailComponent,
     ChangeKdfComponent,
     ChangePasswordComponent,
     ChangePlanComponent,
     CiphersComponent,
     CollectionsComponent,
-    ColorPasswordPipe,
     CreateOrganizationComponent,
     DeauthorizeSessionsComponent,
     DeleteAccountComponent,
@@ -351,21 +321,15 @@ registerLocaleData(localeZhTw, "zh-TW");
     EmergencyAccessViewComponent,
     EmergencyAddEditComponent,
     ExportComponent,
-    ExportScopeCalloutComponent,
     ExposedPasswordsReportComponent,
-    FallbackSrcDirective,
     FamiliesForEnterpriseSetupComponent,
     FolderAddEditComponent,
     FooterComponent,
     FrontendLayoutComponent,
     GroupingsComponent,
     HintComponent,
-    I18nPipe,
-    IconComponent,
     ImportComponent,
     InactiveTwoFactorReportComponent,
-    InputStripSpacesDirective,
-    InputVerbatimDirective,
     LinkSsoComponent,
     LockComponent,
     LoginComponent,
@@ -433,11 +397,8 @@ registerLocaleData(localeZhTw, "zh-TW");
     RequireSsoPolicyComponent,
     ResetPasswordPolicyComponent,
     ReusedPasswordsReportComponent,
-    SearchCiphersPipe,
-    SearchPipe,
     SecurityComponent,
     SecurityKeysComponent,
-    SelectCopyDirective,
     SendAddEditComponent,
     SendComponent,
     SendEffluxDatesComponent,
@@ -449,11 +410,8 @@ registerLocaleData(localeZhTw, "zh-TW");
     SponsoredFamiliesComponent,
     SponsoringOrgRowComponent,
     SsoComponent,
-    StopClickDirective,
-    StopPropDirective,
     TaxInfoComponent,
     ToolsComponent,
-    TrueFalseValueDirective,
     TwoFactorAuthenticationPolicyComponent,
     TwoFactorAuthenticatorComponent,
     TwoFactorComponent,
@@ -472,33 +430,16 @@ registerLocaleData(localeZhTw, "zh-TW");
     UpdateTempPasswordComponent,
     UserBillingComponent,
     UserLayoutComponent,
-    UserNamePipe,
     UserSubscriptionComponent,
     VaultComponent,
     VaultTimeoutInputComponent,
     VerifyEmailComponent,
     VerifyEmailTokenComponent,
-    VerifyMasterPasswordComponent,
     VerifyRecoverDeleteComponent,
     WeakPasswordsReportComponent,
   ],
-  exports: [
-    A11yTitleDirective,
-    A11yInvalidDirective,
-    ApiActionDirective,
-    AvatarComponent,
-    CalloutComponent,
-    FooterComponent,
-    I18nPipe,
-    InputStripSpacesDirective,
-    NavbarComponent,
-    OrganizationPlansComponent,
-    SearchPipe,
-    StopClickDirective,
-    StopPropDirective,
-    UserNamePipe,
-  ],
-  providers: [DatePipe, SearchPipe, UserNamePipe],
+  exports: [FooterComponent, NavbarComponent, OrganizationPlansComponent],
+  providers: [DatePipe],
   bootstrap: [],
 })
 export class OssModule {}
diff --git a/src/app/settings/emergency-access-view.component.html b/src/app/settings/emergency-access-view.component.html
index 7687f37b..1b74204b 100644
--- a/src/app/settings/emergency-access-view.component.html
+++ b/src/app/settings/emergency-access-view.component.html
@@ -13,7 +13,7 @@
             <a href="#" appStopClick (click)="selectCipher(c)" title="{{ 'editItem' | i18n }}">{{
               c.name
             }}</a>
-            <ng-container *ngIf="!organization && c.organizationId">
+            <ng-container *ngIf="c.organizationId">
               <i
                 class="bwi bwi-collection"
                 appStopProp
diff --git a/src/locales/af/messages.json b/src/locales/af/messages.json
index 2a4ad4c5..954cca38 100644
--- a/src/locales/af/messages.json
+++ b/src/locales/af/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Beveiligde nota"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Cards"
+  },
+  "typeIdentityPlural": {
+    "message": "Identities"
+  },
+  "typeSecureNotePlural": {
+    "message": "Secure Notes"
+  },
   "folders": {
     "message": "Vouers"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Skrap Organisasie"
   },
-  "deleteOrganizationDesc": {
-    "message": "Gaan hieronder voort om hierdie organisasie en alle verwante data te skrap. Individuele gebruikersrekeninge bly bestaan maar sal nie meer aan hierdie organisasie gekoppel wees nie. "
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Skrap van die organisasie is permanent. Dit kan nie ontdaan word nie."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organisasie Geskrap"
diff --git a/src/locales/az/messages.json b/src/locales/az/messages.json
index 65b62a51..39d0d929 100644
--- a/src/locales/az/messages.json
+++ b/src/locales/az/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Təhlükəsizlik qeydi"
   },
+  "typeLoginPlural": {
+    "message": "Girişlər"
+  },
+  "typeCardPlural": {
+    "message": "Kartlar"
+  },
+  "typeIdentityPlural": {
+    "message": "Kimliklər"
+  },
+  "typeSecureNotePlural": {
+    "message": "Təhlükəsizlik qeydləri"
+  },
   "folders": {
     "message": "Qovluqlar"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Təşkilatı sil"
   },
-  "deleteOrganizationDesc": {
-    "message": "Bu təşkilatı və əlaqəli bütün verilənlərini silmək üçün aşağıda davam edin. Fərdi istifadəçi hesabları qalacaq, ancaq bu təşkilat ilə əlaqəsi kəsiləcək. "
+  "deletingOrganizationContentWarning": {
+    "message": "$ORGANIZATION$ təşkilatının və bütün əlaqəli verilənlərinin silinməsini təsdiqləmək üçün ana parolu daxil edin. $ORGANIZATION$ anbar verilənləri bunları ehtiva edir:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Təşkilatı silmək birdəfəlik prosesdir. Bu əməliyyatın geri dönüşü yoxdur."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "Silmə prosesindən sonra istifadəçi hesabları aktiv qalacaq, ancaq bu təşkilatla əlaqəli olmayacaq."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "$ORGANIZATION$ təşkilatının silinməsi daimi və geri qaytarıla bilməyən prosesdir.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Təşkilat silindi"
@@ -4326,7 +4353,7 @@
     "message": "Ana parolunuz təzəlikcə təşkilatınızdakı bir administrator tərəfindən dəyişdirildi. Anbara müraciət üçün Ana parolunuzu indi yenilə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."
   },
   "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": "Ana parolunuz bu təşkilatın siyasət tələblərinə cavab vermir. Təşkilata qoşulmaq üçün Ana parolunuzu indi yenilə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."
   },
   "maximumVaultTimeout": {
     "message": "Anbara müraciət bitəcək"
@@ -4465,7 +4492,7 @@
     "message": "Varlıq kimliyi"
   },
   "idpBindingType": {
-    "message": "Binding Type"
+    "message": "Bağlanma növü"
   },
   "idpSingleSignOnServiceUrl": {
     "message": "Tək daxil olma xidmətinin URL-si"
@@ -4483,7 +4510,7 @@
     "message": "İstənilməyən kimlik təsdiqləmə cavabına icazə ver"
   },
   "idpAllowOutboundLogoutRequests": {
-    "message": "Allow outbound logout requests"
+    "message": "Gedən çıxış tələblərinə icazə ver"
   },
   "idpSignAuthenticationRequests": {
     "message": "Sign authentication requests"
diff --git a/src/locales/be/messages.json b/src/locales/be/messages.json
index 1ba7281f..91021ec3 100644
--- a/src/locales/be/messages.json
+++ b/src/locales/be/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Бяспечныя нататкі"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Cards"
+  },
+  "typeIdentityPlural": {
+    "message": "Identities"
+  },
+  "typeSecureNotePlural": {
+    "message": "Secure Notes"
+  },
   "folders": {
     "message": "Папкі"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Delete Organization"
   },
-  "deleteOrganizationDesc": {
-    "message": "Proceed below to delete this organization and all associated data. Individual user accounts will remain, though they will not be associated to this organization anymore. "
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Deleting the organization is permanent. It cannot be undone."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organization Deleted"
diff --git a/src/locales/bg/messages.json b/src/locales/bg/messages.json
index c8db5a0b..22e80325 100644
--- a/src/locales/bg/messages.json
+++ b/src/locales/bg/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Защитена бележка"
   },
+  "typeLoginPlural": {
+    "message": "Записи"
+  },
+  "typeCardPlural": {
+    "message": "Карти"
+  },
+  "typeIdentityPlural": {
+    "message": "Самоличности"
+  },
+  "typeSecureNotePlural": {
+    "message": "Защитени бележки"
+  },
   "folders": {
     "message": "Папки"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Изтриване на организация"
   },
-  "deleteOrganizationDesc": {
-    "message": "Продължете с действието отдолу и организацията и нейните данни ще бъдат изтрити. Абонаментите на отделните хора ще останат, но те няма да бъдат свързани с тази организация. "
+  "deletingOrganizationContentWarning": {
+    "message": "Въведете главната парола, за да потвърдите изтриването на $ORGANIZATION$ и всички свързани данни. Данните в трезора на $ORGANIZATION$ включват:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Изтриването на организация е окончателно и напълно необратимо действие."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "Потребителите ще продължат да съществуват и след изтриването, но вече няма да бъдат свързани с тази организация."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Изтриването на $ORGANIZATION$ е окончателно и необратимо.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Организацията е изтрита"
diff --git a/src/locales/bn/messages.json b/src/locales/bn/messages.json
index 001729ac..861d575f 100644
--- a/src/locales/bn/messages.json
+++ b/src/locales/bn/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "সুরক্ষিত নোট"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Cards"
+  },
+  "typeIdentityPlural": {
+    "message": "Identities"
+  },
+  "typeSecureNotePlural": {
+    "message": "Secure Notes"
+  },
   "folders": {
     "message": "ফোল্ডারসমূহ"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Delete Organization"
   },
-  "deleteOrganizationDesc": {
-    "message": "Proceed below to delete this organization and all associated data. Individual user accounts will remain, though they will not be associated to this organization anymore. "
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Deleting the organization is permanent. It cannot be undone."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organization Deleted"
diff --git a/src/locales/bs/messages.json b/src/locales/bs/messages.json
index 83161b10..f1611257 100644
--- a/src/locales/bs/messages.json
+++ b/src/locales/bs/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Secure Note"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Cards"
+  },
+  "typeIdentityPlural": {
+    "message": "Identities"
+  },
+  "typeSecureNotePlural": {
+    "message": "Secure Notes"
+  },
   "folders": {
     "message": "Folders"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Delete Organization"
   },
-  "deleteOrganizationDesc": {
-    "message": "Proceed below to delete this organization and all associated data. Individual user accounts will remain, though they will not be associated to this organization anymore. "
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Deleting the organization is permanent. It cannot be undone."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organization Deleted"
diff --git a/src/locales/ca/messages.json b/src/locales/ca/messages.json
index 13eb5faf..129b5936 100644
--- a/src/locales/ca/messages.json
+++ b/src/locales/ca/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Nota segura"
   },
+  "typeLoginPlural": {
+    "message": "Inicis de sessió"
+  },
+  "typeCardPlural": {
+    "message": "Targetes"
+  },
+  "typeIdentityPlural": {
+    "message": "Identitats"
+  },
+  "typeSecureNotePlural": {
+    "message": "Notes segures"
+  },
   "folders": {
     "message": "Carpetes"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Suprimeix l'organització"
   },
-  "deleteOrganizationDesc": {
-    "message": "Procediu a eliminar aquesta organització i totes les dades associades. Els comptes d'usuari individuals es mantindran, encara que ja no hi estaran associats. "
+  "deletingOrganizationContentWarning": {
+    "message": "Introduïu la contrasenya mestra per confirmar la supressió de $ORGANIZATION$ i totes les dades associades. Les dades de la caixa forta a $ORGANIZATION$ inclouen:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "La supressió de l'organització és permanent. No es pot desfer."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "Els comptes d'usuari romandran actius després de la supressió, però ja no estaran associats a aquesta organització."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "La supressió de $ORGANIZATION$ és permanent i irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "S'ha suprimit l'organització"
@@ -4417,22 +4444,22 @@
     "message": "Obteniu reclamacions del punt final d'informació d'usuari"
   },
   "additionalScopes": {
-    "message": "Àmbits addicionals/personalitzats (delimitat per comes)"
+    "message": "Àmbits personalitzats"
   },
   "additionalUserIdClaimTypes": {
-    "message": "Tipus de reclamació d'ID d'usuaris addicionals/personalitzats (delimitats per comes)"
+    "message": "Tipus de reclamació d'ID d'usuaris personalitzats"
   },
   "additionalEmailClaimTypes": {
-    "message": "Tipus de reclamació de correu electrònic addicionals/personalitzats (delimitats per comes)"
+    "message": "Tipus de reclamació de correu electrònic"
   },
   "additionalNameClaimTypes": {
-    "message": "Tipus de reclamació de noms addicionals/personalitzats (delimitats per comes)"
+    "message": "Tipus de reclamació de noms personalitzats"
   },
   "acrValues": {
-    "message": "Valors de referència de classe de context d'autenticació sol·licitats (acr_values)"
+    "message": "Valors de referència de classe de context d'autenticació sol·licitats"
   },
   "expectedReturnAcrValue": {
-    "message": "Valor esperat de la reclamació \"acr\" en resposta (validació d'acr)"
+    "message": "Valor esperat de la reclamació \"acr\" en resposta"
   },
   "spEntityId": {
     "message": "ID de l'entitat SP"
@@ -4456,7 +4483,7 @@
     "message": "Algoritme de signatura entrant mínim"
   },
   "spWantAssertionsSigned": {
-    "message": "Voleu les afirmacions signades"
+    "message": "Espereu les afirmacions signades"
   },
   "spValidateCertificates": {
     "message": "Valida certificats"
@@ -4483,10 +4510,10 @@
     "message": "Permet la resposta d'autenticació no sol·licitada"
   },
   "idpAllowOutboundLogoutRequests": {
-    "message": "Allow outbound logout requests"
+    "message": "Permet sol·licituds de tancament de sessió"
   },
   "idpSignAuthenticationRequests": {
-    "message": "Sign authentication requests"
+    "message": "Signa sol·licituds d'autenticació"
   },
   "ssoSettingsSaved": {
     "message": "S'ha guardat la configuració de l'inici de sessió únic."
@@ -4528,19 +4555,19 @@
     "message": "Introduïu el vostre correu electrònic personal per bescanviar Bitwarden Families"
   },
   "sponsoredFamiliesLeaveCopy": {
-    "message": "If you leave or are removed from the sponsoring organization, your Families plan will expire at the end of the billing period."
+    "message": "Si deixeu l'organització patrocinadora o us elimineu, el vostre pla Families caducarà al final del període de facturació."
   },
   "acceptBitwardenFamiliesHelp": {
-    "message": "Accept offer for an existing organization or create a new Families organization."
+    "message": "Accepteu l'oferta d'una organització existent o creeu una nova organització de Famílies."
   },
   "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": "Us han oferit una organització gratuïta del pla de famílies de Bitwarden. Per continuar, heu d'iniciar sessió al compte que ha rebut l'oferta."
   },
   "sponsoredFamiliesAcceptFailed": {
-    "message": "Unable to accept offer. Please resend the offer email from your enterprise account and try again."
+    "message": "No es pot acceptar l'oferta. Torneu a enviar el correu electrònic de l'oferta des del vostre compte d'empresa i torneu-ho a provar."
   },
   "sponsoredFamiliesAcceptFailedShort": {
-    "message": "Unable to accept offer. $DESCRIPTION$",
+    "message": "No es pot acceptar l'oferta. $DESCRIPTION$",
     "placeholders": {
       "description": {
         "content": "$1",
@@ -4570,7 +4597,7 @@
     }
   },
   "resendEmailLabel": {
-    "message": "Resend Sponsorship email to $NAME$ sponsorship",
+    "message": "Torna a enviar el correu electrònic de patrocini al patrocinador $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -4591,10 +4618,10 @@
     "message": "Suprimeix el patrocini"
   },
   "removeSponsorshipConfirmation": {
-    "message": "After removing a sponsorship, you will be responsible for this subscription and related invoices. Are you sure you want to continue?"
+    "message": "Després de suprimir un patrocini, seràs responsable d'aquesta subscripció i de les factures relacionades. Esteu segur que voleu continuar?"
   },
   "sponsorshipCreated": {
-    "message": "Sponsorship Created"
+    "message": "S'ha creat un patrocini"
   },
   "revoke": {
     "message": "Revoca"
@@ -4603,16 +4630,16 @@
     "message": "Correu electrònic enviat"
   },
   "revokeSponsorshipConfirmation": {
-    "message": "After removing this account, the Families organization owner will be responsible for this subscription and related invoices. Are you sure you want to continue?"
+    "message": "Després de suprimir aquest compte, el propietari de l'organització Families serà responsable d'aquesta subscripció i de les factures relacionades. Esteu segur que voleu continuar?"
   },
   "removeSponsorshipSuccess": {
-    "message": "Sponsorship Removed"
+    "message": "S'ha suprimit el patrocini"
   },
   "ssoKeyConnectorUnavailable": {
     "message": "No es pot arribar al connector de claus, torneu-ho a provar més tard."
   },
   "keyConnectorUrl": {
-    "message": "Key Connector URL"
+    "message": "URL del connector de claus"
   },
   "sendVerificationCode": {
     "message": "Envia un codi de verificació al correu electrònic"
@@ -4672,22 +4699,22 @@
     "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."
+    "message": "Les polítiques d'autenticació SSO i d'organització única són necessàries per configurar el desxifrat del connector de claus."
   },
   "memberDecryptionOption": {
-    "message": "Member Decryption Options"
+    "message": "Opcions de desxifrat de membres"
   },
   "memberDecryptionPassDesc": {
     "message": "Un vegada autenticats, els membres desxifraran les dades de la caixa forta amb les seues contrasenyes mestres."
   },
   "keyConnector": {
-    "message": "Key Connector"
+    "message": "Connector de claus"
   },
   "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."
+    "message": "Connecteu l'inici de sessió amb SSO al vostre servidor de claus de desxifrat autoallotjat. Amb aquesta opció, els membres no hauran d'utilitzar les seues contrasenyes mestres per desxifrar les dades de la caixa forta. Poseu-vos en contacte amb l'assistència de Bitwarden per obtenir ajuda per a la configuració."
   },
   "keyConnectorPolicyRestriction": {
-    "message": "\"Login with SSO and Key Connector Decryption\" is enabled. This policy will only apply to Owners and Admins."
+    "message": "\"Inici de sessió amb SSO i desxifrat del connector de claus\" està habilitat. Aquesta política només s'aplicarà als propietaris i administradors."
   },
   "enabledSso": {
     "message": "SSO habilitat"
@@ -4696,40 +4723,40 @@
     "message": "SSO inhabilitat"
   },
   "enabledKeyConnector": {
-    "message": "Enabled Key Connector"
+    "message": "Connector de claus habilitat"
   },
   "disabledKeyConnector": {
-    "message": "Disabled Key Connector"
+    "message": "Connector de claus inhabilitat"
   },
   "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": "Una vegada els membres comencen a utilitzarel connector de claus, la vostra organització no pot tornar al desxifrat de la contrasenya mestra. Continueu només si us sentiu còmode implementant i gestionant un servidor de claus."
   },
   "migratedKeyConnector": {
-    "message": "Migrated to Key Connector"
+    "message": "S'ha migrat al connector claus"
   },
   "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": "Proporcioneu una forma de pagament per associar-vos amb l'organització. No us preocupeu, no us cobrarem res tret que seleccioneu característiques addicionals o el vostre patrocini caduque. "
   },
   "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": "L'oferta de patrocini ha caducat. Podeu suprimir l'organització que heu creat per evitar un càrrec al final de la vostra prova de 7 dies. En cas contrari, podeu tancar aquest missatge per mantenir l'organització i assumir la responsabilitat de la facturació."
   },
   "newFamiliesOrganization": {
     "message": "Nova organització de famílies"
   },
   "acceptOffer": {
-    "message": "Accept Offer"
+    "message": "Accepta l'oferta"
   },
   "sponsoringOrg": {
-    "message": "Sponsoring Organization"
+    "message": "Organització patrocinadora"
   },
   "keyConnectorTest": {
     "message": "Prova"
   },
   "keyConnectorTestSuccess": {
-    "message": "Success! Key Connector reached."
+    "message": "Correcte! S'ha arribat al connector clau."
   },
   "keyConnectorTestFail": {
-    "message": "Cannot reach Key Connector. Check URL."
+    "message": "No es pot arribar al connector de claus. Comproveu l'URL."
   },
   "sponsorshipTokenHasExpired": {
     "message": "L'oferta de patrocini ha caducat."
@@ -4738,7 +4765,7 @@
     "message": "GRATUÏT amb patrocini"
   },
   "formErrorSummaryPlural": {
-    "message": "$COUNT$ fields above need your attention.",
+    "message": "$COUNT$ camps de dalt necessiten la vostra atenció.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4747,10 +4774,10 @@
     }
   },
   "formErrorSummarySingle": {
-    "message": "1 field above needs your attention."
+    "message": "1 camp de dalt necessita la vostra atenció."
   },
   "fieldRequiredError": {
-    "message": "$FIELDNAME$ is required.",
+    "message": "$FIELDNAME$ és obligatori.",
     "placeholders": {
       "fieldname": {
         "content": "$1",
@@ -4759,31 +4786,31 @@
     }
   },
   "required": {
-    "message": "required"
+    "message": "requerit"
   },
   "idpSingleSignOnServiceUrlRequired": {
-    "message": "Required if Entity ID is not a URL."
+    "message": "Requerit si l'identificador d'entitat no és un URL."
   },
   "openIdOptionalCustomizations": {
-    "message": "Optional Customizations"
+    "message": "Personalització opcional"
   },
   "openIdAuthorityRequired": {
-    "message": "Required if Authority is not valid."
+    "message": "Requerit si l'autoritat no és vàlida."
   },
   "separateMultipleWithComma": {
-    "message": "Separate multiple with a comma."
+    "message": "Separa múltiples amb una coma."
   },
   "sessionTimeout": {
-    "message": "Your session has timed out. Please go back and try logging in again."
+    "message": "La sessió ha expirat. Torneu arrere i proveu d'iniciar sessió de nou."
   },
   "exportingPersonalVaultTitle": {
-    "message": "Exporting Personal Vault"
+    "message": "S'està exportant la caixa forta personal"
   },
   "exportingOrganizationVaultTitle": {
-    "message": "Exporting Organization Vault"
+    "message": "S'està exportant la caixa forta de l’organització"
   },
   "exportingPersonalVaultDescription": {
-    "message": "Only the personal vault items associated with $EMAIL$ will be exported. Organization vault items will not be included.",
+    "message": "Només s'exportaran els elements personals de la caixa forta associats a $EMAIL$. Els elements de la caixa forta de l'organització no s'inclouran.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -4792,7 +4819,7 @@
     }
   },
   "exportingOrganizationVaultDescription": {
-    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. Personal vault items and items from other organizations will not be included.",
+    "message": "Només s'exportaran els elements personals de la caixa forta associats a $ORGANIZATION$. Els elements de la caixa forta personal no s'inclouran.",
     "placeholders": {
       "organization": {
         "content": "$1",
diff --git a/src/locales/cs/messages.json b/src/locales/cs/messages.json
index 188a1b0c..87679030 100644
--- a/src/locales/cs/messages.json
+++ b/src/locales/cs/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Poznámka"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Cards"
+  },
+  "typeIdentityPlural": {
+    "message": "Identities"
+  },
+  "typeSecureNotePlural": {
+    "message": "Secure Notes"
+  },
   "folders": {
     "message": "Složky"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Smazat organizaci"
   },
-  "deleteOrganizationDesc": {
-    "message": "Pokračujte níže pro smazání této organizace a všech souvisejících dat. Jednotlivé uživatelské účty zůstanou zachovány, i když již nebudou přidruženy k této organizaci."
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Smazání organizace je trvalé. Tuto akci nelze vrátit zpět."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organizace byla smazána."
diff --git a/src/locales/da/messages.json b/src/locales/da/messages.json
index 6afba569..e2def42b 100644
--- a/src/locales/da/messages.json
+++ b/src/locales/da/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Sikret notat"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Kort"
+  },
+  "typeIdentityPlural": {
+    "message": "Identiteter"
+  },
+  "typeSecureNotePlural": {
+    "message": "Sikre notater"
+  },
   "folders": {
     "message": "Mapper"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Slet organisation"
   },
-  "deleteOrganizationDesc": {
-    "message": "Fortsæt nedenfor for at slette denne organisation og alle tilknyttede data. Individuelle brugerkonti forbliver, selv om de ikke længere vil være tilknyttet denne organisation."
+  "deletingOrganizationContentWarning": {
+    "message": "Angiv hovedadgangskoden for at bekræfte sletning af $ORGANIZATION$ og alle tilknyttede data. Boks-data i $ORGANIZATION$ inkluderer:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Sletning af organisationen er permanent. Det kan ikke fortrydes."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "Brugerkonti forbliver aktive efter sletning, men vil ikke længere være tilknyttet denne organisation."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Sletning af $ORGANIZATION$ er permanent og uigenkaldelig.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organisation slettet"
@@ -4414,25 +4441,25 @@
     "message": "OIDC-omdirigeringsadfærd"
   },
   "getClaimsFromUserInfoEndpoint": {
-    "message": "Hent claims fra brugerinfoslutpunkt"
+    "message": "Hent claims fra endpoint for brugeroplysninger"
   },
   "additionalScopes": {
-    "message": "Yderligere/tilpassede Scopes (kommasepareret)"
+    "message": "Brugerdefinerede omfang"
   },
   "additionalUserIdClaimTypes": {
-    "message": "Yderligere/tilpassede bruger-ID-claimtyper (kommasepareret)"
+    "message": "Tilpassede bruger-id claim-typer"
   },
   "additionalEmailClaimTypes": {
-    "message": "Yderligere/tilpassede e-mail-claimtyper (kommasepareret)"
+    "message": "E-mail claim-typer"
   },
   "additionalNameClaimTypes": {
-    "message": "Yderligere/tilpassede navne-claimtyper (kommasepareret)"
+    "message": "Tilpassede navne-claimtyper"
   },
   "acrValues": {
-    "message": "Anmodet godkendelseskontekst klassereferenceværdier (acr_værdier)"
+    "message": "Anmodet godkendelseskontekst klassereferenceværdier"
   },
   "expectedReturnAcrValue": {
-    "message": "Forventet \"acr\"-claimværdi som svar (acr-validering)"
+    "message": "Forventet \"acr\"-claimværdi i svar"
   },
   "spEntityId": {
     "message": "SP Enheds-ID"
@@ -4456,7 +4483,7 @@
     "message": "Minimum indgående signeringsalgoritme"
   },
   "spWantAssertionsSigned": {
-    "message": "Ønsker assertions signeret"
+    "message": "Forvent signerede assertions"
   },
   "spValidateCertificates": {
     "message": "Validér certifikater"
@@ -4483,10 +4510,10 @@
     "message": "Tillad uopfordret godkendelsessvar"
   },
   "idpAllowOutboundLogoutRequests": {
-    "message": "Allow outbound logout requests"
+    "message": "Tillad udgående logout-anmodninger"
   },
   "idpSignAuthenticationRequests": {
-    "message": "Sign authentication requests"
+    "message": "Signér godkendelsesanmodninger"
   },
   "ssoSettingsSaved": {
     "message": "Single Sign-On opsætning blev gemt."
@@ -4738,7 +4765,7 @@
     "message": "GRATIS med sponsorat"
   },
   "formErrorSummaryPlural": {
-    "message": "$COUNT$ fields above need your attention.",
+    "message": "$COUNT$ felter ovenfor kræver din opmærksomhed.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4747,10 +4774,10 @@
     }
   },
   "formErrorSummarySingle": {
-    "message": "1 field above needs your attention."
+    "message": "1 felt ovenfor kræver din opmærksomhed."
   },
   "fieldRequiredError": {
-    "message": "$FIELDNAME$ is required.",
+    "message": "$FIELDNAME$ er påkrævet.",
     "placeholders": {
       "fieldname": {
         "content": "$1",
@@ -4759,28 +4786,28 @@
     }
   },
   "required": {
-    "message": "required"
+    "message": "krævet"
   },
   "idpSingleSignOnServiceUrlRequired": {
-    "message": "Required if Entity ID is not a URL."
+    "message": "Krævet, hvis enheds-id ikke er en URL."
   },
   "openIdOptionalCustomizations": {
-    "message": "Optional Customizations"
+    "message": "Valgfrie tilpasninger"
   },
   "openIdAuthorityRequired": {
-    "message": "Required if Authority is not valid."
+    "message": "Påkrævet, hvis autoriteten ikke er gyldig."
   },
   "separateMultipleWithComma": {
-    "message": "Separate multiple with a comma."
+    "message": "Adskil flere med et komma."
   },
   "sessionTimeout": {
-    "message": "Sessionen er udløbet. Gå tilbage og prøv at logge ind igen."
+    "message": "Din session er udløbet. Gå tilbage og prøv at logge ind igen."
   },
   "exportingPersonalVaultTitle": {
-    "message": "Eksport af Personlig Boks"
+    "message": "Eksporterer personlig boks"
   },
   "exportingOrganizationVaultTitle": {
-    "message": "Eksport af Organisationsboks"
+    "message": "Eksporterer organisationsboks"
   },
   "exportingPersonalVaultDescription": {
     "message": "Kun de personlige bokselementer tilknyttet $EMAIL$ eksporteres. Organisationsbokseelementer medtages ikke.",
diff --git a/src/locales/de/messages.json b/src/locales/de/messages.json
index 11c611ef..08e0b649 100644
--- a/src/locales/de/messages.json
+++ b/src/locales/de/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Sichere Notiz"
   },
+  "typeLoginPlural": {
+    "message": "Zugangsdaten"
+  },
+  "typeCardPlural": {
+    "message": "Karten"
+  },
+  "typeIdentityPlural": {
+    "message": "Identitäten"
+  },
+  "typeSecureNotePlural": {
+    "message": "Sichere Notizen"
+  },
   "folders": {
     "message": "Ordner"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Organisation löschen"
   },
-  "deleteOrganizationDesc": {
-    "message": "Fahren Sie fort, um diese Organisation und alle ihre zugehörigen Daten zu löschen. Einzelne Benutzerkonten bleiben erhalten, obwohl sie nicht länger mit dieser Organisation verbunden sein werden. "
+  "deletingOrganizationContentWarning": {
+    "message": "Gebe das Master-Passwort ein, um das Löschen von $ORGANIZATION$ und allen zugehörigen Daten zu bestätigen. Die Tresordaten in $ORGANIZATION$ beinhalten:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Das Löschen dieser Organisation ist unwiderruflich."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "Die Benutzerkonten bleiben nach dem Löschen aktiv, sind aber nicht mehr mit dieser Organisation verknüpft."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Das Löschen von $ORGANIZATION$ ist dauerhaft und unwiderruflich.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Die Organisation wurde gelöscht"
diff --git a/src/locales/el/messages.json b/src/locales/el/messages.json
index 8b081760..09ddd9d3 100644
--- a/src/locales/el/messages.json
+++ b/src/locales/el/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Ασφαλής Σημείωση"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Cards"
+  },
+  "typeIdentityPlural": {
+    "message": "Identities"
+  },
+  "typeSecureNotePlural": {
+    "message": "Secure Notes"
+  },
   "folders": {
     "message": "Φάκελοι"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Διαγραφή Οργανισμού"
   },
-  "deleteOrganizationDesc": {
-    "message": "Συνεχίστε παρακάτω για να διαγράψετε αυτόν τον οργανισμό και όλα τα σχετικά δεδομένα. Θα παραμείνουν μεμονωμένοι λογαριασμοί χρηστών, αν και δεν θα συσχετίζονται πλέον με αυτόν τον οργανισμό. "
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Η διαγραφή του οργανισμού είναι μόνιμη. Δεν μπορεί να αναιρεθεί."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Ο Οργανισμός Διαγράφηκε"
diff --git a/src/locales/en_GB/messages.json b/src/locales/en_GB/messages.json
index a5d69230..d5cb4cc9 100644
--- a/src/locales/en_GB/messages.json
+++ b/src/locales/en_GB/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Secure note"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Cards"
+  },
+  "typeIdentityPlural": {
+    "message": "Identities"
+  },
+  "typeSecureNotePlural": {
+    "message": "Secure Notes"
+  },
   "folders": {
     "message": "Folders"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Delete organisation"
   },
-  "deleteOrganizationDesc": {
-    "message": "Proceed below to delete this organisation and all associated data. Individual user accounts will remain, though they will not be associated to this organisation anymore. "
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Deleting the organisation is permanent. It cannot be undone."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organisation."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organisation deleted"
@@ -4765,7 +4792,7 @@
     "message": "Required if Entity ID is not a URL."
   },
   "openIdOptionalCustomizations": {
-    "message": "Optional Customizations"
+    "message": "Optional Customisations"
   },
   "openIdAuthorityRequired": {
     "message": "Required if Authority is not valid."
@@ -4780,10 +4807,10 @@
     "message": "Exporting Personal Vault"
   },
   "exportingOrganizationVaultTitle": {
-    "message": "Exporting Organization Vault"
+    "message": "Exporting Organisation Vault"
   },
   "exportingPersonalVaultDescription": {
-    "message": "Only the personal vault items associated with $EMAIL$ will be exported. Organization vault items will not be included.",
+    "message": "Only the personal vault items associated with $EMAIL$ will be exported. Organisation vault items will not be included.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -4792,7 +4819,7 @@
     }
   },
   "exportingOrganizationVaultDescription": {
-    "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. Personal vault items and items from other organizations will not be included.",
+    "message": "Only the organisation vault associated with $ORGANIZATION$ will be exported. Personal vault items and items from other organisations will not be included.",
     "placeholders": {
       "organization": {
         "content": "$1",
diff --git a/src/locales/en_IN/messages.json b/src/locales/en_IN/messages.json
index 301627b3..cc67883d 100644
--- a/src/locales/en_IN/messages.json
+++ b/src/locales/en_IN/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Secure note"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Cards"
+  },
+  "typeIdentityPlural": {
+    "message": "Identities"
+  },
+  "typeSecureNotePlural": {
+    "message": "Secure Notes"
+  },
   "folders": {
     "message": "Folders"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Delete organisation"
   },
-  "deleteOrganizationDesc": {
-    "message": "Proceed below to delete this organisation and all associated data. Individual user accounts will remain, though they will not be associated to this organisation anymore. "
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Deleting the organisation is permanent. It cannot be undone."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organisation deleted"
diff --git a/src/locales/eo/messages.json b/src/locales/eo/messages.json
index 64f9d3ca..8bbba86b 100644
--- a/src/locales/eo/messages.json
+++ b/src/locales/eo/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Sekura Noto"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Cards"
+  },
+  "typeIdentityPlural": {
+    "message": "Identities"
+  },
+  "typeSecureNotePlural": {
+    "message": "Secure Notes"
+  },
   "folders": {
     "message": "Dosierujoj"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Forigi Organizon"
   },
-  "deleteOrganizationDesc": {
-    "message": "Sekvu sube por forigi ĉi tiun organizon kaj ĉiujn rilatajn datumojn. Individuaj kontoj de uzanto restos, kvankam ili ne plu estos asociitaj al ĉi tiu organizo."
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Forigi la organizon estas konstanta. Ĝi ne povas esti malfarita."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organizo Forigita"
diff --git a/src/locales/es/messages.json b/src/locales/es/messages.json
index 978931ac..51c04652 100644
--- a/src/locales/es/messages.json
+++ b/src/locales/es/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Nota segura"
   },
+  "typeLoginPlural": {
+    "message": "Inicios de sesión"
+  },
+  "typeCardPlural": {
+    "message": "Tarjetas"
+  },
+  "typeIdentityPlural": {
+    "message": "Identidades"
+  },
+  "typeSecureNotePlural": {
+    "message": "Notas seguras"
+  },
   "folders": {
     "message": "Carpetas"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Eliminar organización"
   },
-  "deleteOrganizationDesc": {
-    "message": "Continúa el proceso para eliminar esta organización y todos los datos asociados a ella. Las cuentas de usuario individuales se mantendrán, aunque no estarán asociadas con la organización a partir de ahora."
+  "deletingOrganizationContentWarning": {
+    "message": "Introduzca la contraseña maestra para confirmar la eliminación de $ORGANIZATION$ y todos los datos asociados. Los datos de la bóveda de $ORGANIZATION$ incluyen:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Eliminar la organización es permanente. No se puede deshacer."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "Las cuentas de usuario permanecerán activas después de la eliminación, pero ya no estarán asociadas a esta organización."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "La eliminación de $ORGANIZATION$ es permanente y irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organización eliminada"
@@ -4363,22 +4390,22 @@
     "message": "Tiempo de espera personalizado para la bóveda"
   },
   "vaultTimeoutToLarge": {
-    "message": "Your vault timeout exceeds the restriction set by your organization."
+    "message": "El tiempo de espera de tu bóveda excede la restricción establecida por tu organización."
   },
   "disablePersonalVaultExport": {
     "message": "Desactivar exportación de bóveda personal"
   },
   "disablePersonalVaultExportDesc": {
-    "message": "Prohibits users from exporting their private vault data."
+    "message": "Prohíbe a los usuarios exportar sus datos privados de bóveda."
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "Exportación de bóveda desactivada"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "Una o más políticas de tu organización te impiden exportar tu bóveda personal."
   },
   "selectType": {
-    "message": "Select SSO Type"
+    "message": "Seleccionar tipo de SSO"
   },
   "type": {
     "message": "Tipo"
@@ -4387,31 +4414,31 @@
     "message": "Configuración de OpenID Connect"
   },
   "samlSpConfig": {
-    "message": "SAML Service Provider Configuration"
+    "message": "Configuración del proveedor de servicios SAML"
   },
   "samlIdpConfig": {
-    "message": "SAML Identity Provider Configuration"
+    "message": "Configuración del proveedor de identidad SAML"
   },
   "callbackPath": {
-    "message": "Callback Path"
+    "message": "Ruta de llamada"
   },
   "signedOutCallbackPath": {
-    "message": "Signed Out Callback Path"
+    "message": "Ruta de devolución de llamada cerrada"
   },
   "authority": {
     "message": "Autoridad"
   },
   "clientId": {
-    "message": "Client ID"
+    "message": "ID de cliente"
   },
   "clientSecret": {
-    "message": "Client Secret"
+    "message": "Secreto de cliente"
   },
   "metadataAddress": {
-    "message": "Metadata Address"
+    "message": "Dirección de metadatos"
   },
   "oidcRedirectBehavior": {
-    "message": "OIDC Redirect Behavior"
+    "message": "Comportamiento de la redirección de OIDC"
   },
   "getClaimsFromUserInfoEndpoint": {
     "message": "Get claims from user info endpoint"
@@ -4501,10 +4528,10 @@
     "message": "Redeem your Free Bitwarden for Families plan today to keep your data secure even when you are not at work."
   },
   "sponsoredFamiliesInclude": {
-    "message": "The Bitwarden for Families plan include"
+    "message": "El plan de Bitwarden para familias incluye"
   },
   "sponsoredFamiliesPremiumAccess": {
-    "message": "Premium access for up to 6 users"
+    "message": "Acceso Premium para hasta 6 usuarios"
   },
   "sponsoredFamiliesSharedCollections": {
     "message": "Shared collections for Family secrets"
diff --git a/src/locales/et/messages.json b/src/locales/et/messages.json
index d982cabf..7d9fafcf 100644
--- a/src/locales/et/messages.json
+++ b/src/locales/et/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Turvaline märkus"
   },
+  "typeLoginPlural": {
+    "message": "Kontod"
+  },
+  "typeCardPlural": {
+    "message": "Kaardid"
+  },
+  "typeIdentityPlural": {
+    "message": "Identiteedid"
+  },
+  "typeSecureNotePlural": {
+    "message": "Turvalised märkmed"
+  },
   "folders": {
     "message": "Kaustad"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Kustuta organisatsioon"
   },
-  "deleteOrganizationDesc": {
-    "message": "Jätkamaks organisatsiooni ja sellega seonduvate andmete kustutamist, liigu alla. Individuaalsed kasutajakontod säilitatakse, aga nad ei kuulu enam sellesse organisatsiooni. "
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Organisatsiooni kustutamine on ühekordne tegevus. Seda ei saa tagasi võtta."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organisatsioon on kustutatud"
@@ -4329,7 +4356,7 @@
     "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."
   },
   "maximumVaultTimeout": {
-    "message": "Vault Timeout"
+    "message": "Hoidla ajalõpp"
   },
   "maximumVaultTimeoutDesc": {
     "message": "Configure a maximum vault timeout for all users."
diff --git a/src/locales/fi/messages.json b/src/locales/fi/messages.json
index 6c77e871..dc19dcce 100644
--- a/src/locales/fi/messages.json
+++ b/src/locales/fi/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Salattu muistio"
   },
+  "typeLoginPlural": {
+    "message": "Kirjautumistiedot"
+  },
+  "typeCardPlural": {
+    "message": "Kortit"
+  },
+  "typeIdentityPlural": {
+    "message": "Henkilöllisyydet"
+  },
+  "typeSecureNotePlural": {
+    "message": "Salatut muistiot"
+  },
   "folders": {
     "message": "Kansiot"
   },
@@ -1212,7 +1224,7 @@
     "message": "Premium-toiminnot ovat jo käytettävissäsi, johtuen organisaatiosta, jonka jäsen olet."
   },
   "manage": {
-    "message": "Hallinnointi"
+    "message": "Hallinnoi"
   },
   "disable": {
     "message": "Poista käytöstä"
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Poista organisaatio"
   },
-  "deleteOrganizationDesc": {
-    "message": "Jatka alla poistaaksesi organisaation ja kaikki siihen liittyvät tiedot. Yksittäiset käyttäjätilit säilyvät, mutta ne eivät ole enää kytköksissä tähän organisaatioon."
+  "deletingOrganizationContentWarning": {
+    "message": "Vahvista organisaation $ORGANIZATION$ ja kaikkien sen kohteiden poisto syöttämällä pääsalasanasi. Holvin sisältämiä organisaation $ORGANIZATION$ tietoja ovat:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Organisaation poisto on pysyvä toimenpide, eikä sen peruminen ole mahdollista."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "Käyttäjätilit pysyvät poiston jälkeen toiminnassa, mutta niiden kytkös tähän organisaatioon poistuu."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Organisaation $ORGANIZATION$ poisto on pysyvää, eikä sitä ole mahdollista perua.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organisaatio poistettu"
@@ -3547,7 +3574,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendNotesDesc": {
-    "message": "Yksityiset muistiinpanot tästä Sendistä.",
+    "message": "Yksityisiä merkintöjä tästä Sendistä.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "disabled": {
diff --git a/src/locales/fil/messages.json b/src/locales/fil/messages.json
index 4031f554..cfa8e1a4 100644
--- a/src/locales/fil/messages.json
+++ b/src/locales/fil/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Secure Note"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Cards"
+  },
+  "typeIdentityPlural": {
+    "message": "Identities"
+  },
+  "typeSecureNotePlural": {
+    "message": "Secure Notes"
+  },
   "folders": {
     "message": "Mga folder"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Delete Organization"
   },
-  "deleteOrganizationDesc": {
-    "message": "Proceed below to delete this organization and all associated data. Individual user accounts will remain, though they will not be associated to this organization anymore. "
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Deleting the organization is permanent. It cannot be undone."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organization Deleted"
diff --git a/src/locales/fr/messages.json b/src/locales/fr/messages.json
index df290424..66537d99 100644
--- a/src/locales/fr/messages.json
+++ b/src/locales/fr/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Note sécurisée"
   },
+  "typeLoginPlural": {
+    "message": "Identifiants"
+  },
+  "typeCardPlural": {
+    "message": "Cartes"
+  },
+  "typeIdentityPlural": {
+    "message": "Identités"
+  },
+  "typeSecureNotePlural": {
+    "message": "Notes sécurisées"
+  },
   "folders": {
     "message": "Dossiers"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Supprimer l'organisation"
   },
-  "deleteOrganizationDesc": {
-    "message": "Poursuivez ci-dessous pour supprimer cette organisation ainsi que toutes les données associées. Les comptes des utilisateurs individuels ne seront pas supprimés, mais ils ne seront plus associés à cette organisation. "
+  "deletingOrganizationContentWarning": {
+    "message": "Entrez le mot de passe maître pour confirmer la suppression de $ORGANIZATION$ et de toutes les données associées. Les données du coffre dans $ORGANIZATION$ inclut:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "La suppression d'une organisation est définitive. Cette action ne peut pas être annulée."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "Les comptes utilisateur resteront actifs après la suppression, mais ne seront plus associés à cette organisation."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "La suppression de $ORGANIZATION$ est permanente et irréversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organisation supprimée"
@@ -4417,22 +4444,22 @@
     "message": "Récupérer les claims depuis l'endpoint d'informations utilisateur (User Info Endpoint)"
   },
   "additionalScopes": {
-    "message": "Scopes supplémentaires/personnalisés (séparés par des virgules)"
+    "message": "Scopes personnalisés"
   },
   "additionalUserIdClaimTypes": {
-    "message": "Types de claim supplémentaires/personnalisés pour l'identifiant de l'utilisateur (séparés par des virgules)"
+    "message": "Types de claim personnalisés pour l'identifiant de l'utilisateur"
   },
   "additionalEmailClaimTypes": {
-    "message": "Types de claim supplémentaires/personnalisés pour l'e-mail (séparé par des virgules)"
+    "message": "Types de claim pour l'e-mail"
   },
   "additionalNameClaimTypes": {
-    "message": "Types de claim supplémentaires/personnalisés pour le nom (séparé par des virgules)"
+    "message": "Types de claim personnalisés pour le nom"
   },
   "acrValues": {
-    "message": "Valeurs Authentication Context Class Reference demandées (acr_values)"
+    "message": "Valeurs Authentication Context Class Reference demandées"
   },
   "expectedReturnAcrValue": {
-    "message": "Valeur attendue pour le claim \"acr\" dans la réponse (validation acr)"
+    "message": "Valeur attendue pour le claim \"acr\" dans la réponse"
   },
   "spEntityId": {
     "message": "ID de l'entité du Service Provider"
@@ -4456,7 +4483,7 @@
     "message": "Algorithme de signature entrant minimal"
   },
   "spWantAssertionsSigned": {
-    "message": "Exiger des Assertions signées"
+    "message": "Exiger des assertions signées"
   },
   "spValidateCertificates": {
     "message": "Vérifier les certificats"
@@ -4483,10 +4510,10 @@
     "message": "Autoriser les réponses d'authentification non sollicitées"
   },
   "idpAllowOutboundLogoutRequests": {
-    "message": "Allow outbound logout requests"
+    "message": "Autoriser les demandes de déconnexion sortantes"
   },
   "idpSignAuthenticationRequests": {
-    "message": "Sign authentication requests"
+    "message": "Signer les demandes d'authentification"
   },
   "ssoSettingsSaved": {
     "message": "La configuration SSO a été enregistrée."
@@ -4738,7 +4765,7 @@
     "message": "GRATUIT avec le parrainage"
   },
   "formErrorSummaryPlural": {
-    "message": "$COUNT$ fields above need your attention.",
+    "message": "$COUNT$ champs ci-dessus nécessitent votre attention.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4747,10 +4774,10 @@
     }
   },
   "formErrorSummarySingle": {
-    "message": "1 field above needs your attention."
+    "message": "1 champ ci-dessus nécessite votre attention."
   },
   "fieldRequiredError": {
-    "message": "$FIELDNAME$ is required.",
+    "message": "$FIELDNAME$ est requis.",
     "placeholders": {
       "fieldname": {
         "content": "$1",
@@ -4759,16 +4786,16 @@
     }
   },
   "required": {
-    "message": "required"
+    "message": "requis"
   },
   "idpSingleSignOnServiceUrlRequired": {
-    "message": "Required if Entity ID is not a URL."
+    "message": "Requis si l'ID d'Entité n'est pas une URL."
   },
   "openIdOptionalCustomizations": {
-    "message": "Optional Customizations"
+    "message": "Personnalisations Optionnelles"
   },
   "openIdAuthorityRequired": {
-    "message": "Required if Authority is not valid."
+    "message": "Requis si l'Autorité n'est pas valide."
   },
   "separateMultipleWithComma": {
     "message": "Séparer avec des virgules."
diff --git a/src/locales/he/messages.json b/src/locales/he/messages.json
index d6fc011a..0cc7803c 100644
--- a/src/locales/he/messages.json
+++ b/src/locales/he/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "פתק מאובטח"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Cards"
+  },
+  "typeIdentityPlural": {
+    "message": "Identities"
+  },
+  "typeSecureNotePlural": {
+    "message": "Secure Notes"
+  },
   "folders": {
     "message": "תיקיות"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "מחק ארגון"
   },
-  "deleteOrganizationDesc": {
-    "message": "המשך כאן כדי למחוק את הארגון הזה ואת כל המידע המשויך. משתמשים פרטיים ישארו, אך הם לא יהיו משוייכים לארגון זה יותר."
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "מחיקת ארגון היא סופית. לא ניתן לבטל פעולה זו."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "הארגון נמחק"
diff --git a/src/locales/hi/messages.json b/src/locales/hi/messages.json
index b32ae286..118a4a00 100644
--- a/src/locales/hi/messages.json
+++ b/src/locales/hi/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Secure Note"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Cards"
+  },
+  "typeIdentityPlural": {
+    "message": "Identities"
+  },
+  "typeSecureNotePlural": {
+    "message": "Secure Notes"
+  },
   "folders": {
     "message": "Folders"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Delete Organization"
   },
-  "deleteOrganizationDesc": {
-    "message": "Proceed below to delete this organization and all associated data. Individual user accounts will remain, though they will not be associated to this organization anymore. "
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Deleting the organization is permanent. It cannot be undone."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organization Deleted"
diff --git a/src/locales/hr/messages.json b/src/locales/hr/messages.json
index 4e938c31..f08f2c43 100644
--- a/src/locales/hr/messages.json
+++ b/src/locales/hr/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Sigurna bilješka"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Cards"
+  },
+  "typeIdentityPlural": {
+    "message": "Identities"
+  },
+  "typeSecureNotePlural": {
+    "message": "Secure Notes"
+  },
   "folders": {
     "message": "Mape"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Izbriši organizaciju"
   },
-  "deleteOrganizationDesc": {
-    "message": "Nastavite dalje za brisanje ove organizacije i svih povezanih podataka. Pojedinačni korisnički računi će ostati, no više neće biti povezani s ovom organizacijom. "
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Brisanje organizacije je TRAJNO i NEPOVRATNO i naknadno je nije moguće vratiti."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organizacija izbrisana"
diff --git a/src/locales/hu/messages.json b/src/locales/hu/messages.json
index 7cee3654..e5afbc6c 100644
--- a/src/locales/hu/messages.json
+++ b/src/locales/hu/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Biztonságos jegyzet"
   },
+  "typeLoginPlural": {
+    "message": "Bejelentkezések"
+  },
+  "typeCardPlural": {
+    "message": "Kártyák"
+  },
+  "typeIdentityPlural": {
+    "message": "Azonosságok"
+  },
+  "typeSecureNotePlural": {
+    "message": "Biztonságos jegyzetek"
+  },
   "folders": {
     "message": "Mappák"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Szervezet törlése"
   },
-  "deleteOrganizationDesc": {
-    "message": "Az alábbiak szerint törölhető a szervezet és az összes kapcsolódó adat. Az egyedi felhasználói fiókok megmaradnak, bár nem maradnak társítva ehhez a szervezethez."
+  "deletingOrganizationContentWarning": {
+    "message": "Adjuk meg a mesterjelszót $ORGANIZATION$ és az összes társított adat törlésének megerősítéséhez. $ORGANIZATION$ széfadatainak tartalma:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "A szervezet végleges törlése folyamatban van. A művelet nem vonható vissza."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "A felhasználói fiókok aktívak maradnak a törlés után, de a továbbiakben nincsenek társítva ehhez a szervezethez."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "$ORGANIZATION$ törlése végleges és nincs visszaállítási lehetőség.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "A szervezet törlésre került."
@@ -4483,10 +4510,10 @@
     "message": "Kéretlen hitelesítési válasz engedélyezése"
   },
   "idpAllowOutboundLogoutRequests": {
-    "message": "Allow outbound logout requests"
+    "message": "Kimenü kijelentkezési kérések engedélyezése"
   },
   "idpSignAuthenticationRequests": {
-    "message": "Sign authentication requests"
+    "message": "Hitelesítési kérések aláírása"
   },
   "ssoSettingsSaved": {
     "message": "Az egyszeri bejelentkezés konfigurációja mentésre került."
@@ -4738,7 +4765,7 @@
     "message": "INGYENES a szponzorációval"
   },
   "formErrorSummaryPlural": {
-    "message": "$COUNT$ fields above need your attention.",
+    "message": "$COUNT$ mező fentebb figyelmet érdemel.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4747,10 +4774,10 @@
     }
   },
   "formErrorSummarySingle": {
-    "message": "1 field above needs your attention."
+    "message": "1 mező fentebb figyelmet érdemel."
   },
   "fieldRequiredError": {
-    "message": "$FIELDNAME$ is required.",
+    "message": "$FIELDNAME$ szükséges.",
     "placeholders": {
       "fieldname": {
         "content": "$1",
@@ -4759,19 +4786,19 @@
     }
   },
   "required": {
-    "message": "required"
+    "message": "kötelező"
   },
   "idpSingleSignOnServiceUrlRequired": {
-    "message": "Required if Entity ID is not a URL."
+    "message": "Szükséges ha az entitás azonosító nem webcím."
   },
   "openIdOptionalCustomizations": {
-    "message": "Optional Customizations"
+    "message": "Opcionális testreszabások"
   },
   "openIdAuthorityRequired": {
-    "message": "Required if Authority is not valid."
+    "message": "Szükséges, ha a hitelesítés nem érvényes."
   },
   "separateMultipleWithComma": {
-    "message": "Separate multiple with a comma."
+    "message": "Több érték esetén elválasztás vesszővel."
   },
   "sessionTimeout": {
     "message": "A munkamenet lejárt. Lépjünk vissza és próbáljunk újra bejelentkezni."
diff --git a/src/locales/id/messages.json b/src/locales/id/messages.json
index 8d889f9b..e5e5bbca 100644
--- a/src/locales/id/messages.json
+++ b/src/locales/id/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Catatan Aman"
   },
+  "typeLoginPlural": {
+    "message": "Masuk"
+  },
+  "typeCardPlural": {
+    "message": "Kartu"
+  },
+  "typeIdentityPlural": {
+    "message": "Identitas"
+  },
+  "typeSecureNotePlural": {
+    "message": "Catatan Aman"
+  },
   "folders": {
     "message": "Folder"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Hapus Organisasi"
   },
-  "deleteOrganizationDesc": {
-    "message": "Lanjutkan di bawah untuk menghapus organisasi ini dan semua data terkait. Akun pengguna individual akan tetap ada, meskipun mereka tidak akan dikaitkan lagi dengan organisasi ini. "
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Menghapus organisasi bersifat permanen. Itu tidak bisa dibatalkan."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organisasi Dihapus"
@@ -2918,7 +2945,7 @@
     "message": "Kouta Langganan"
   },
   "subscriptionUpdated": {
-    "message": "Subscription updated"
+    "message": "Langganan diperbarui"
   },
   "additionalOptions": {
     "message": "Opsi Tambahan"
@@ -4600,7 +4627,7 @@
     "message": "Revoke"
   },
   "emailSent": {
-    "message": "Email Sent"
+    "message": "Email Terkirim"
   },
   "revokeSponsorshipConfirmation": {
     "message": "After removing this account, the Families organization owner will be responsible for this subscription and related invoices. Are you sure you want to continue?"
@@ -4618,22 +4645,22 @@
     "message": "Send a verification code to your email"
   },
   "sendCode": {
-    "message": "Send Code"
+    "message": "Kirim Kode"
   },
   "codeSent": {
-    "message": "Code Sent"
+    "message": "Kode Terkirim"
   },
   "verificationCode": {
-    "message": "Verification Code"
+    "message": "Kode Verifikasi"
   },
   "confirmIdentity": {
-    "message": "Confirm your identity to continue."
+    "message": "Konfirmasi identitas Anda untuk melanjutkan."
   },
   "verificationCodeRequired": {
-    "message": "Verification code is required."
+    "message": "Kode verifikasi diperlukan."
   },
   "invalidVerificationCode": {
-    "message": "Invalid verification code"
+    "message": "Kode verifikasi tidak valid"
   },
   "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.",
@@ -4645,7 +4672,7 @@
     }
   },
   "leaveOrganization": {
-    "message": "Leave Organization"
+    "message": "Tinggalkan Organisasi"
   },
   "removeMasterPassword": {
     "message": "Remove Master Password"
@@ -4654,21 +4681,21 @@
     "message": "Master password removed."
   },
   "allowSso": {
-    "message": "Allow SSO authentication"
+    "message": "Izinkan autentikasi SSO"
   },
   "allowSsoDesc": {
     "message": "Once set up, your configuration will be saved and members will be able to authenticate using their Identity Provider credentials."
   },
   "ssoPolicyHelpStart": {
-    "message": "Enable the",
+    "message": "Aktifkan",
     "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.'"
   },
   "ssoPolicyHelpLink": {
-    "message": "SSO Authentication policy",
+    "message": "kebijakan Otentikasi 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.'"
   },
   "ssoPolicyHelpEnd": {
-    "message": "to require all members to log in with SSO.",
+    "message": "untuk mewajibkan semua anggota masuk dengan 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": {
@@ -4690,10 +4717,10 @@
     "message": "\"Login with SSO and Key Connector Decryption\" is enabled. This policy will only apply to Owners and Admins."
   },
   "enabledSso": {
-    "message": "Enabled SSO"
+    "message": "Aktifkan SSO"
   },
   "disabledSso": {
-    "message": "Disabled SSO"
+    "message": "Matikan SSO"
   },
   "enabledKeyConnector": {
     "message": "Enabled Key Connector"
@@ -4750,7 +4777,7 @@
     "message": "1 field above needs your attention."
   },
   "fieldRequiredError": {
-    "message": "$FIELDNAME$ is required.",
+    "message": "$FIELDNAME$ diperlukan.",
     "placeholders": {
       "fieldname": {
         "content": "$1",
@@ -4759,13 +4786,13 @@
     }
   },
   "required": {
-    "message": "required"
+    "message": "diperlukan"
   },
   "idpSingleSignOnServiceUrlRequired": {
     "message": "Required if Entity ID is not a URL."
   },
   "openIdOptionalCustomizations": {
-    "message": "Optional Customizations"
+    "message": "Kustomisasi Opsional"
   },
   "openIdAuthorityRequired": {
     "message": "Required if Authority is not valid."
diff --git a/src/locales/it/messages.json b/src/locales/it/messages.json
index 9578fdfd..3e1d5c21 100644
--- a/src/locales/it/messages.json
+++ b/src/locales/it/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Nota sicura"
   },
+  "typeLoginPlural": {
+    "message": "Login"
+  },
+  "typeCardPlural": {
+    "message": "Carte"
+  },
+  "typeIdentityPlural": {
+    "message": "Identità"
+  },
+  "typeSecureNotePlural": {
+    "message": "Note sicure"
+  },
   "folders": {
     "message": "Cartelle"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Elimina organizzazione"
   },
-  "deleteOrganizationDesc": {
-    "message": "Procedi sotto per eliminare questa organizzazione e tutti i dati associati. I singoli account utente rimarranno, anche se non saranno più associati a questa organizzazione. "
+  "deletingOrganizationContentWarning": {
+    "message": "Digita la password principale per confermare l'eliminazione di $ORGANIZATION$ e di tutti i dati associati. I dati della cassaforte in $ORGANIZATION$ includono:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "L'eliminazione dell'organizzazione è permanente. Non può essere annullata."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "Gli account utente rimarranno attivi dopo l'eliminazione, ma non saranno più associati a questa organizzazione."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "L'eliminazione di $ORGANIZATION$ è definitiva e irreversibile.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organizzazione eliminata"
@@ -4483,10 +4510,10 @@
     "message": "Consenti risposta di autenticazione non richiesta"
   },
   "idpAllowOutboundLogoutRequests": {
-    "message": "Allow outbound logout requests"
+    "message": "Permetti richieste di disconnessione in uscita"
   },
   "idpSignAuthenticationRequests": {
-    "message": "Sign authentication requests"
+    "message": "Firma le richieste di autenticazione"
   },
   "ssoSettingsSaved": {
     "message": "La configurazione del Single Sign-On è stata salvata."
@@ -4762,7 +4789,7 @@
     "message": "obbligatorio"
   },
   "idpSingleSignOnServiceUrlRequired": {
-    "message": "Richiesto se l'ID dell'entità non è un URL."
+    "message": "Richiesto se l'Entity ID non è un URL."
   },
   "openIdOptionalCustomizations": {
     "message": "Personalizzazioni opzionali"
diff --git a/src/locales/ja/messages.json b/src/locales/ja/messages.json
index 1c4eaa8b..804ee72d 100644
--- a/src/locales/ja/messages.json
+++ b/src/locales/ja/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "メモ"
   },
+  "typeLoginPlural": {
+    "message": "ログイン"
+  },
+  "typeCardPlural": {
+    "message": "カード"
+  },
+  "typeIdentityPlural": {
+    "message": "ID"
+  },
+  "typeSecureNotePlural": {
+    "message": "セキュアメモ"
+  },
   "folders": {
     "message": "フォルダー"
   },
@@ -316,7 +328,7 @@
     "message": "姓"
   },
   "fullName": {
-    "message": "Full Name"
+    "message": "フルネーム"
   },
   "address1": {
     "message": "住所 1"
@@ -758,7 +770,7 @@
     "message": "アカウントにアクセスするには、WebAuthn 対応のセキュリティキーを使用してください。"
   },
   "webAuthnMigrated": {
-    "message": "(Migrated from FIDO)"
+    "message": "(FIDOから統合)"
   },
   "emailTitle": {
     "message": "メールアドレス"
@@ -904,7 +916,7 @@
     "message": "メールアドレスを変更"
   },
   "changeEmailTwoFactorWarning": {
-    "message": "Proceeding will change your account email address. It will not change the email address used for two-factor authentication. You can change this email address in the Two-Step Login settings."
+    "message": "続行するとアカウントのメールアドレスが変更されます。2段階認証に使用されるメールアドレスは変更されません。必要に応じて2段階認証の設定で変更できます。"
   },
   "newEmail": {
     "message": "新しいメールアドレス"
@@ -1006,7 +1018,7 @@
     "message": "組織の保管庫を削除"
   },
   "vaultAccessedByProvider": {
-    "message": "Vault accessed by provider."
+    "message": "保管庫がプロバイダーからアクセスされました。"
   },
   "purgeVaultDesc": {
     "message": "続行すると保管庫内のすべてのアイテムとフォルダーが削除されます。組織と共有しているアイテムは削除されません。"
@@ -1395,7 +1407,7 @@
     "message": "セキュリティキーの読み取り中に問題が発生しました。もう一度やり直して下さい。"
   },
   "twoFactorWebAuthnWarning": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should enable another two-step login provider so that you can access your account when WebAuthn cannot be used. Supported platforms:"
+    "message": "プラットフォームの制限により、WebAuthnはBitwardenの全てのアプリケーションで使用できるわけではありません。WebAuthnが使用できない場合に備えて、他の二段階認証プロバイダを有効化しておくことをおすすめします。サポートされているプラットフォーム:"
   },
   "twoFactorWebAuthnSupportWeb": {
     "message": "Web vault and browser extensions on a desktop/laptop with a WebAuthn enabled browser (Chrome, Opera, Vivaldi, or Firefox with FIDO U2F enabled)."
@@ -2153,7 +2165,7 @@
     "message": "方針"
   },
   "singleSignOn": {
-    "message": "Single Sign-On"
+    "message": "シングルサインオン(SSO)"
   },
   "editPolicy": {
     "message": "方針を編集"
@@ -2249,7 +2261,7 @@
     "message": "確認済み"
   },
   "clientOwnerEmail": {
-    "message": "Client Owner Email"
+    "message": "クライアントの管理者のメールアドレス"
   },
   "owner": {
     "message": "オーナー"
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "組織の削除"
   },
-  "deleteOrganizationDesc": {
-    "message": "続行するとこの組織と関連するすべてのデータが削除されます。組織と関連がなくなっても個々のユーザーアカウントは維持されます。"
+  "deletingOrganizationContentWarning": {
+    "message": "$ORGANIZATION$ と関連するすべてのデータの削除を確認するためにマスターパスワードを入力してください。 $ORGANIZATION$ の保管庫データは下記を含みます:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "組織を恒久的に削除します。元に戻すことはできません。"
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "削除後もユーザーアカウントはアクティブになりますが、この組織に関連付けられなくなります。"
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "$ORGANIZATION$ を削除すると元に戻せません。",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "組織が削除されました。"
diff --git a/src/locales/ka/messages.json b/src/locales/ka/messages.json
index 83161b10..f1611257 100644
--- a/src/locales/ka/messages.json
+++ b/src/locales/ka/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Secure Note"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Cards"
+  },
+  "typeIdentityPlural": {
+    "message": "Identities"
+  },
+  "typeSecureNotePlural": {
+    "message": "Secure Notes"
+  },
   "folders": {
     "message": "Folders"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Delete Organization"
   },
-  "deleteOrganizationDesc": {
-    "message": "Proceed below to delete this organization and all associated data. Individual user accounts will remain, though they will not be associated to this organization anymore. "
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Deleting the organization is permanent. It cannot be undone."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organization Deleted"
diff --git a/src/locales/km/messages.json b/src/locales/km/messages.json
index 83161b10..f1611257 100644
--- a/src/locales/km/messages.json
+++ b/src/locales/km/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Secure Note"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Cards"
+  },
+  "typeIdentityPlural": {
+    "message": "Identities"
+  },
+  "typeSecureNotePlural": {
+    "message": "Secure Notes"
+  },
   "folders": {
     "message": "Folders"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Delete Organization"
   },
-  "deleteOrganizationDesc": {
-    "message": "Proceed below to delete this organization and all associated data. Individual user accounts will remain, though they will not be associated to this organization anymore. "
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Deleting the organization is permanent. It cannot be undone."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organization Deleted"
diff --git a/src/locales/kn/messages.json b/src/locales/kn/messages.json
index f0246017..45de3be6 100644
--- a/src/locales/kn/messages.json
+++ b/src/locales/kn/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "ಸುರಕ್ಷಿತ ಟಿಪ್ಪಣಿ"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Cards"
+  },
+  "typeIdentityPlural": {
+    "message": "Identities"
+  },
+  "typeSecureNotePlural": {
+    "message": "Secure Notes"
+  },
   "folders": {
     "message": "ಫೋಲ್ಡರ್‌ಗಳು"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "ಸಂಸ್ಥೆಯನ್ನು ಅಳಿಸಿ"
   },
-  "deleteOrganizationDesc": {
-    "message": "ಈ ಸಂಸ್ಥೆ ಮತ್ತು ಎಲ್ಲಾ ಸಂಬಂಧಿತ ಡೇಟಾವನ್ನು ಅಳಿಸಲು ಕೆಳಗೆ ಮುಂದುವರಿಯಿರಿ. ವೈಯಕ್ತಿಕ ಬಳಕೆದಾರರ ಖಾತೆಗಳು ಉಳಿಯುತ್ತವೆ, ಆದರೂ ಅವುಗಳು ಈ ಸಂಸ್ಥೆಗೆ ಸಂಬಂಧ ಹೊಂದಿಲ್ಲ. "
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "ಸಂಸ್ಥೆಯನ್ನು ಅಳಿಸುವುದು ಶಾಶ್ವತವಾಗಿದೆ. ಅದನ್ನು ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "ಸಂಸ್ಥೆ ಅಳಿಸಲಾಗಿದೆ"
diff --git a/src/locales/ko/messages.json b/src/locales/ko/messages.json
index 5c2a6850..3dbf9a91 100644
--- a/src/locales/ko/messages.json
+++ b/src/locales/ko/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "보안 메모"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Cards"
+  },
+  "typeIdentityPlural": {
+    "message": "Identities"
+  },
+  "typeSecureNotePlural": {
+    "message": "Secure Notes"
+  },
   "folders": {
     "message": "폴더"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "조직 삭제"
   },
-  "deleteOrganizationDesc": {
-    "message": "조직과 연관된 모든 데이터를 삭제하려면 다음 단계로 나아가십시오. 개인 사용자 계정은 유지되지만 더 이상 조직에 연결되지 않습니다. "
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "조직 삭제는 영구적이며 되돌릴 수 없습니다."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "조직 삭제됨"
diff --git a/src/locales/lv/messages.json b/src/locales/lv/messages.json
index d7d8f2d9..d042c422 100644
--- a/src/locales/lv/messages.json
+++ b/src/locales/lv/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Droša piezīme"
   },
+  "typeLoginPlural": {
+    "message": "Pierakstīšanās vienumi"
+  },
+  "typeCardPlural": {
+    "message": "Kartes"
+  },
+  "typeIdentityPlural": {
+    "message": "Identitātes"
+  },
+  "typeSecureNotePlural": {
+    "message": "Drošās piezīmes"
+  },
   "folders": {
     "message": "Mapes"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Izdzēst apvienību"
   },
-  "deleteOrganizationDesc": {
-    "message": "Turpiniet zemāk lai izdzēstu organizāciju un visus ar to saistītos datus. Individuāli lietotāju konti paliks, bet tie vairs nebūs saistīti ar šo organizāciju. "
+  "deletingOrganizationContentWarning": {
+    "message": "Ir jāievada galvenā parole, lai apstiprinātu $ORGANIZATION$ un saistīto datu dzēšanu. $ORGANIZATION$ glabātavas dati iekļauj:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Apvienības dzēšana ir paliekoša. To nevar atsaukt."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "Pēc dzēšanas lietotāju konti joprojām darbosies, bet tie vairs nebūs saistīti ar šo apvienību."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "$ORGANIZATION$ dzēšana ir paliekoša un neatgriezeniska.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Apvienība izdzēsta"
@@ -4483,10 +4510,10 @@
     "message": "Atļaut nelūgtas autentifikācijas atbildi"
   },
   "idpAllowOutboundLogoutRequests": {
-    "message": "Allow outbound logout requests"
+    "message": "Atļaut izejošos izrakstīšanās pieprasījumus"
   },
   "idpSignAuthenticationRequests": {
-    "message": "Sign authentication requests"
+    "message": "Parakstīt autentifikācijas pieprasījumus"
   },
   "ssoSettingsSaved": {
     "message": "Vienotās pieteikšanās uzstādījumi tika saglabāti."
@@ -4738,7 +4765,7 @@
     "message": "Bezmaksas ar pabalstītājdarbību"
   },
   "formErrorSummaryPlural": {
-    "message": "$COUNT$ fields above need your attention.",
+    "message": "$COUNT$ augstāk esošajiem laukiem ir jāpievērš uzmanība.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4747,10 +4774,10 @@
     }
   },
   "formErrorSummarySingle": {
-    "message": "1 field above needs your attention."
+    "message": "1 augstāk esošajam laukam jāpievērš uzmanība."
   },
   "fieldRequiredError": {
-    "message": "$FIELDNAME$ is required.",
+    "message": "$FIELDNAME$ ir nepieciešams.",
     "placeholders": {
       "fieldname": {
         "content": "$1",
@@ -4759,19 +4786,19 @@
     }
   },
   "required": {
-    "message": "required"
+    "message": "nepieciešams"
   },
   "idpSingleSignOnServiceUrlRequired": {
-    "message": "Required if Entity ID is not a URL."
+    "message": "Nepieciešams, ja vienības Id nav URL."
   },
   "openIdOptionalCustomizations": {
-    "message": "Optional Customizations"
+    "message": "Papildu pielāgojumi"
   },
   "openIdAuthorityRequired": {
-    "message": "Required if Authority is not valid."
+    "message": "Nepieciešams, ja autoritāte ir nederīga."
   },
   "separateMultipleWithComma": {
-    "message": "Separate multiple with a comma."
+    "message": "Vairākus atdalīt ar komatu."
   },
   "sessionTimeout": {
     "message": "Sesijai iestājās noildze. Lūgums mēģināt pierakstīties vēlreiz."
diff --git a/src/locales/ml/messages.json b/src/locales/ml/messages.json
index a4bdf684..faef5ecd 100644
--- a/src/locales/ml/messages.json
+++ b/src/locales/ml/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "സുരക്ഷിത കുറിപ്പ്"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Cards"
+  },
+  "typeIdentityPlural": {
+    "message": "Identities"
+  },
+  "typeSecureNotePlural": {
+    "message": "Secure Notes"
+  },
   "folders": {
     "message": "ഫോൾഡറുകൾ"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "സംഘടന ഇല്ലാതാക്കുക"
   },
-  "deleteOrganizationDesc": {
-    "message": "Proceed below to delete this organization and all associated data. Individual user accounts will remain, though they will not be associated to this organization anymore. "
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Deleting the organization is permanent. It cannot be undone."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "സംഘടന ഇല്ലാതാക്കി"
diff --git a/src/locales/nb/messages.json b/src/locales/nb/messages.json
index df18c30d..3c8a966b 100644
--- a/src/locales/nb/messages.json
+++ b/src/locales/nb/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Sikker notis"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Cards"
+  },
+  "typeIdentityPlural": {
+    "message": "Identities"
+  },
+  "typeSecureNotePlural": {
+    "message": "Secure Notes"
+  },
   "folders": {
     "message": "Mapper"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Slett organisasjonen"
   },
-  "deleteOrganizationDesc": {
-    "message": "Fortsett nedenfor for å slette denne organisasjonen og alle dens tilknyttede data. Individuelle brukerkontoer vil forbli igjen, skjønt de vil ikke være tilknyttet denne organisasjonen lenger. "
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Å slette organisasjonen er permanent. Det kan ikke bli angret på."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organisasjonen ble slettet"
diff --git a/src/locales/nl/messages.json b/src/locales/nl/messages.json
index 4edba87b..0ba9485a 100644
--- a/src/locales/nl/messages.json
+++ b/src/locales/nl/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Veilige notitie"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Kaarten"
+  },
+  "typeIdentityPlural": {
+    "message": "Identiteiten"
+  },
+  "typeSecureNotePlural": {
+    "message": "Beveiligde notities"
+  },
   "folders": {
     "message": "Mappen"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Organisatie verwijderen"
   },
-  "deleteOrganizationDesc": {
-    "message": "Ga hieronder verder om deze organisatie en alle bijbehorende gegevens te verwijderen. De individuele gebruikersaccounts blijven bestaan maar ze zullen niet meer gekoppeld zijn aan deze organisatie."
+  "deletingOrganizationContentWarning": {
+    "message": "Voer het hoofdwachtwoord in om de verwijdering van $ORGANIZATION$ en alle bijbehorende gegevens te bevestigen. De kluisgegevens in $ORGANIZATION$ bevatten:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Verwijdering van de organisatie is definitief. Je kunt dit niet ongedaan maken."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "Gebruikersaccounts blijven actief na het verwijderen maar worden niet langer gekoppeld aan deze organisatie."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Het verwijderen van $ORGANIZATION$ is permanent en onomkeerbaar.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organisatie verwijderd"
@@ -4483,10 +4510,10 @@
     "message": "Unsolicited Authentication Response toestaan"
   },
   "idpAllowOutboundLogoutRequests": {
-    "message": "Allow outbound logout requests"
+    "message": "Uitgaande uitlog aanvragen toestaan"
   },
   "idpSignAuthenticationRequests": {
-    "message": "Sign authentication requests"
+    "message": "Onderteken authenticatie aanvragen"
   },
   "ssoSettingsSaved": {
     "message": "Single Sign-On configuratie is opgeslagen."
@@ -4762,16 +4789,16 @@
     "message": "vereist"
   },
   "idpSingleSignOnServiceUrlRequired": {
-    "message": "Required if Entity ID is not a URL."
+    "message": "Vereist als Entiteit ID geen URL is."
   },
   "openIdOptionalCustomizations": {
     "message": "Optionele aanpassingen"
   },
   "openIdAuthorityRequired": {
-    "message": "Required if Authority is not valid."
+    "message": "Vereist als Autoriteit niet geldig is."
   },
   "separateMultipleWithComma": {
-    "message": "Separate multiple with a comma."
+    "message": "Scheid meerdere met kommas."
   },
   "sessionTimeout": {
     "message": "Je sessie is verlopen. Ga terug en probeer opnieuw in te loggen."
diff --git a/src/locales/nn/messages.json b/src/locales/nn/messages.json
index 04b012a6..bd222a2a 100644
--- a/src/locales/nn/messages.json
+++ b/src/locales/nn/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Secure Note"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Cards"
+  },
+  "typeIdentityPlural": {
+    "message": "Identities"
+  },
+  "typeSecureNotePlural": {
+    "message": "Secure Notes"
+  },
   "folders": {
     "message": "Folders"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Delete Organization"
   },
-  "deleteOrganizationDesc": {
-    "message": "Proceed below to delete this organization and all associated data. Individual user accounts will remain, though they will not be associated to this organization anymore. "
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Deleting the organization is permanent. It cannot be undone."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organization Deleted"
diff --git a/src/locales/pl/messages.json b/src/locales/pl/messages.json
index 541f5209..a16a699c 100644
--- a/src/locales/pl/messages.json
+++ b/src/locales/pl/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Bezpieczna notatka"
   },
+  "typeLoginPlural": {
+    "message": "Dane logowania"
+  },
+  "typeCardPlural": {
+    "message": "Karty"
+  },
+  "typeIdentityPlural": {
+    "message": "Tożsamości"
+  },
+  "typeSecureNotePlural": {
+    "message": "Bezpieczne notatki"
+  },
   "folders": {
     "message": "Foldery"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Usuń organizację"
   },
-  "deleteOrganizationDesc": {
-    "message": "Kontynuuj poniżej, aby usunąć tę organizację i wszystkie powiązane z nią dane. Indywidualne konta użytkowników pozostaną, ale nie będą one już połączone za tą organizacją. "
+  "deletingOrganizationContentWarning": {
+    "message": "Wprowadź hasło główne, aby potwierdzić usunięcie $ORGANIZATION$ i wszystkich powiązanych danych. Dane sejfu w $ORGANIZATION$ obejmują:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Usunięcie organizacji jest nieodwracalne. Ta czynność nie może zostać cofnięta."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "Konta użytkowników pozostaną aktywne po usunięciu, ale nie będą już powiązane z tą organizacją."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Usuwanie organizacji $ORGANIZATION$ jest trwałe i nieodwracalne.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organizacja została usunięta"
@@ -4750,7 +4777,7 @@
     "message": "1 pole powyżej wymaga Twojej uwagi."
   },
   "fieldRequiredError": {
-    "message": "$FIELDNAME$ jest wymagane.",
+    "message": "Pole $FIELDNAME$ jest wymagane.",
     "placeholders": {
       "fieldname": {
         "content": "$1",
diff --git a/src/locales/pt_BR/messages.json b/src/locales/pt_BR/messages.json
index 916b4a6c..7b45588f 100644
--- a/src/locales/pt_BR/messages.json
+++ b/src/locales/pt_BR/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Nota Segura"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Cards"
+  },
+  "typeIdentityPlural": {
+    "message": "Identities"
+  },
+  "typeSecureNotePlural": {
+    "message": "Secure Notes"
+  },
   "folders": {
     "message": "Pastas"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Excluir Organização"
   },
-  "deleteOrganizationDesc": {
-    "message": "Continue abaixo para excluir esta organização e todos os dados associados. As contas de usuários individuais permanecerão, embora elas não serão mais associadas a essa organização. "
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "A exclusão da organização é permanente. Não pode ser desfeita."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organização Excluida"
diff --git a/src/locales/pt_PT/messages.json b/src/locales/pt_PT/messages.json
index c80da5f6..9913834d 100644
--- a/src/locales/pt_PT/messages.json
+++ b/src/locales/pt_PT/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Nota segura"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Cards"
+  },
+  "typeIdentityPlural": {
+    "message": "Identities"
+  },
+  "typeSecureNotePlural": {
+    "message": "Secure Notes"
+  },
   "folders": {
     "message": "Pastas"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Eliminar organização"
   },
-  "deleteOrganizationDesc": {
-    "message": "Proceda abaixo para eliminar esta organização e todos os dados associados. Contas de utilizadores individuais serão mantidas, embora já não estarão associadas a esta organização. "
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "A eliminação da organização é permanente. Não pode ser desfeita."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organização eliminada"
diff --git a/src/locales/ro/messages.json b/src/locales/ro/messages.json
index 9120ede5..e2e88500 100644
--- a/src/locales/ro/messages.json
+++ b/src/locales/ro/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Notă protejată"
   },
+  "typeLoginPlural": {
+    "message": "Conectări"
+  },
+  "typeCardPlural": {
+    "message": "Carduri"
+  },
+  "typeIdentityPlural": {
+    "message": "Identități"
+  },
+  "typeSecureNotePlural": {
+    "message": "Note protejate"
+  },
   "folders": {
     "message": "Dosare"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Ștergere organizație"
   },
-  "deleteOrganizationDesc": {
-    "message": "Continuați în modul indicat mai jos pentru a șterge această organizație și toate datele asociate. Conturile de utilizator individuale vor rămâne, deși nu vor mai fi asociate cu această organizație. "
+  "deletingOrganizationContentWarning": {
+    "message": "Introduceți parola principală pentru a confirma ștergerea $ORGANIZATION$ și a tuturor datelor asociate. Datele de seif din $ORGANIZATION$ includ:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Ștergerea organizației este definitivă. Nu poate fi anulată."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "Conturile de utilizator vor rămâne active după ștergere, dar nu vor mai fi asociate cu această organizație."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Ștergerea $ORGANIZATION$ este permanentă și ireversibilă.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organizația a fost ștearsă"
@@ -4414,25 +4441,25 @@
     "message": "Comportament de redirecționare OIDC"
   },
   "getClaimsFromUserInfoEndpoint": {
-    "message": "Obținere de revendicări din informații utilizator de punct final"
+    "message": "Obținere de claims de la punctul final de info utilizator"
   },
   "additionalScopes": {
-    "message": "Domenii de aplicare suplimentare/personalizate (delimitate prin virgule)"
+    "message": "Scopes personalizate"
   },
   "additionalUserIdClaimTypes": {
-    "message": "Tipuri de revendicări ID utilizator suplimentare/personalizate (delimitate prin virgule)"
+    "message": "Tipuri de claim personalizate de ID utilizator"
   },
   "additionalEmailClaimTypes": {
-    "message": "Tipuri de revendicări E-mail suplimentare/personalizate (delimitate prin virgule)"
+    "message": "Tipuri de Claim e-mail"
   },
   "additionalNameClaimTypes": {
-    "message": "Tipuri de revendicări Nume suplimentare/personalizate (delimitate prin virgule)"
+    "message": "Tipuri de Claim cu nume personalizate"
   },
   "acrValues": {
-    "message": "Valorile de referință ale clasei de context de autentificare solicitate (acr_values)"
+    "message": "Valorile de referință ale clasei de context de autentificare solicitate"
   },
   "expectedReturnAcrValue": {
-    "message": "Valoarea preconizată a revendicării „acr” în răspuns (validare acr)"
+    "message": "Valoarea Claim „acr” care trebuie așteptată în răspuns"
   },
   "spEntityId": {
     "message": "ID-ul Entității SP"
@@ -4456,10 +4483,10 @@
     "message": "Algoritmul minim de semnare de intrare"
   },
   "spWantAssertionsSigned": {
-    "message": "Vreau aserțiunile semnate"
+    "message": "Se așteaptă afirmații semnate"
   },
   "spValidateCertificates": {
-    "message": "Validați certificatele"
+    "message": "Validare certificate"
   },
   "idpEntityId": {
     "message": "ID-ul Entității"
@@ -4480,13 +4507,13 @@
     "message": "Algoritm de semnare de ieșire"
   },
   "idpAllowUnsolicitedAuthnResponse": {
-    "message": "Permiteți răspunsul de autentificare nesolicitat"
+    "message": "Se permite răspunsul nesolicitat de autentificare"
   },
   "idpAllowOutboundLogoutRequests": {
-    "message": "Allow outbound logout requests"
+    "message": "Se permit cererile de deconectare de ieșire"
   },
   "idpSignAuthenticationRequests": {
-    "message": "Sign authentication requests"
+    "message": "Semnare a solicitărilor de autentificare"
   },
   "ssoSettingsSaved": {
     "message": "Configurația de conectare unică a fost salvată."
@@ -4738,7 +4765,7 @@
     "message": "GRATUIT cu sponsorizare"
   },
   "formErrorSummaryPlural": {
-    "message": "$COUNT$ fields above need your attention.",
+    "message": "$COUNT$ câmpuri de mai sus necesită atenția dvs.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4747,10 +4774,10 @@
     }
   },
   "formErrorSummarySingle": {
-    "message": "1 field above needs your attention."
+    "message": "1 câmp de mai sus necesită atenția dvs."
   },
   "fieldRequiredError": {
-    "message": "$FIELDNAME$ is required.",
+    "message": "$FIELDNAME$ este obligatoriu.",
     "placeholders": {
       "fieldname": {
         "content": "$1",
@@ -4759,19 +4786,19 @@
     }
   },
   "required": {
-    "message": "required"
+    "message": "necesar"
   },
   "idpSingleSignOnServiceUrlRequired": {
-    "message": "Required if Entity ID is not a URL."
+    "message": "Necesar dacă ID-ul de entitate nu este un URL."
   },
   "openIdOptionalCustomizations": {
-    "message": "Optional Customizations"
+    "message": "Personalizări opționale"
   },
   "openIdAuthorityRequired": {
-    "message": "Required if Authority is not valid."
+    "message": "Necesar dacă Autoritatea nu este validă."
   },
   "separateMultipleWithComma": {
-    "message": "Separate multiple with a comma."
+    "message": "Separați mai multe prin virgulă."
   },
   "sessionTimeout": {
     "message": "Sesiunea dvs. a expirat. Vă rugăm reveniți și încercați să vă autentificați din nou."
diff --git a/src/locales/ru/messages.json b/src/locales/ru/messages.json
index f0284a9d..3f2966cd 100644
--- a/src/locales/ru/messages.json
+++ b/src/locales/ru/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Защищенная заметка"
   },
+  "typeLoginPlural": {
+    "message": "Логины"
+  },
+  "typeCardPlural": {
+    "message": "Карты"
+  },
+  "typeIdentityPlural": {
+    "message": "Личная информация"
+  },
+  "typeSecureNotePlural": {
+    "message": "Защищенные заметки"
+  },
   "folders": {
     "message": "Папки"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Удалить организацию"
   },
-  "deleteOrganizationDesc": {
-    "message": "Выполните следующие действия, чтобы удалить эту организацию и все связанные с ней данные. Индивидуальные аккаунты пользователей останутся, но они больше не будут связаны с этой организацией. "
+  "deletingOrganizationContentWarning": {
+    "message": "Введите мастер-пароль для подтверждения удаления $ORGANIZATION$ и всех связанных с ней данных. Данные хранилища в $ORGANIZATION$ включают:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Удаление организации необратимо. Это действие будет нельзя отменить."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "Учетные записи пользователей останутся активными после удаления, но больше не будут связаны с этой организацией."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Удаление $ORGANIZATION$ окончательно и необратимо.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Организация удалена"
diff --git a/src/locales/si/messages.json b/src/locales/si/messages.json
index 496c85ce..cc1788a8 100644
--- a/src/locales/si/messages.json
+++ b/src/locales/si/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Secure Note"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Cards"
+  },
+  "typeIdentityPlural": {
+    "message": "Identities"
+  },
+  "typeSecureNotePlural": {
+    "message": "Secure Notes"
+  },
   "folders": {
     "message": "බහාලුම්"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Delete Organization"
   },
-  "deleteOrganizationDesc": {
-    "message": "Proceed below to delete this organization and all associated data. Individual user accounts will remain, though they will not be associated to this organization anymore. "
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Deleting the organization is permanent. It cannot be undone."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organization Deleted"
diff --git a/src/locales/sk/messages.json b/src/locales/sk/messages.json
index deb13a69..063548ed 100644
--- a/src/locales/sk/messages.json
+++ b/src/locales/sk/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Zabezpečená poznámka"
   },
+  "typeLoginPlural": {
+    "message": "Prihlásenia"
+  },
+  "typeCardPlural": {
+    "message": "Karty"
+  },
+  "typeIdentityPlural": {
+    "message": "Identity"
+  },
+  "typeSecureNotePlural": {
+    "message": "Zabezpečené poznámky"
+  },
   "folders": {
     "message": "Priečinky"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Odstrániť organizáciu"
   },
-  "deleteOrganizationDesc": {
-    "message": "Pokračujte nižšie ak chcete odstrániť túto organizáciu a všetky súvisiace dáta. Individuálni používatelia budu zachovaní, ale už nebudú súčasťou tejto organizácie. "
+  "deletingOrganizationContentWarning": {
+    "message": "Zadaním hlavného hesla potvrďte odstránenie položky $ORGANIZATION$ a všetkých súvisiacich údajov. Údaje trezora v položke $ORGANIZATION$ zahŕňajú:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Odstránenie organizácie je trvalé. Operáciu nie je možné vrátiť späť."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "Používateľské účty zostanú aktívne aj po odstránení, ale už nebudú spojené s touto organizáciou."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Odstránenie $ORGANIZATION$ je trvalé a nezvratné.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organizácia odstránená"
diff --git a/src/locales/sl/messages.json b/src/locales/sl/messages.json
index fd632558..0c0391b7 100644
--- a/src/locales/sl/messages.json
+++ b/src/locales/sl/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Varni zapisek"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Cards"
+  },
+  "typeIdentityPlural": {
+    "message": "Identities"
+  },
+  "typeSecureNotePlural": {
+    "message": "Secure Notes"
+  },
   "folders": {
     "message": "Mape"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Delete Organization"
   },
-  "deleteOrganizationDesc": {
-    "message": "Proceed below to delete this organization and all associated data. Individual user accounts will remain, though they will not be associated to this organization anymore. "
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Deleting the organization is permanent. It cannot be undone."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organization Deleted"
diff --git a/src/locales/sr/messages.json b/src/locales/sr/messages.json
index 6aa71f23..44a1fb63 100644
--- a/src/locales/sr/messages.json
+++ b/src/locales/sr/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Zaštićena beleška"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Cards"
+  },
+  "typeIdentityPlural": {
+    "message": "Identities"
+  },
+  "typeSecureNotePlural": {
+    "message": "Secure Notes"
+  },
   "folders": {
     "message": "Fascikle"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Delete Organization"
   },
-  "deleteOrganizationDesc": {
-    "message": "Proceed below to delete this organization and all associated data. Individual user accounts will remain, though they will not be associated to this organization anymore. "
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Deleting the organization is permanent. It cannot be undone."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organization Deleted"
diff --git a/src/locales/sv/messages.json b/src/locales/sv/messages.json
index c0e97e14..52776e88 100644
--- a/src/locales/sv/messages.json
+++ b/src/locales/sv/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Säker anteckning"
   },
+  "typeLoginPlural": {
+    "message": "Inloggningar"
+  },
+  "typeCardPlural": {
+    "message": "Kort"
+  },
+  "typeIdentityPlural": {
+    "message": "Identiteter"
+  },
+  "typeSecureNotePlural": {
+    "message": "Säkra anteckningar"
+  },
   "folders": {
     "message": "Mappar"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Radera organisation"
   },
-  "deleteOrganizationDesc": {
-    "message": "Fortsätt nedan för att radera denna organisation och all tillhörande data. Enskilda användarkonton kommer finnas kvar, men de kommer inte längre tillhöra denna organisation. "
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Att radera organisationen är permanent. Det går inte att ångra."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organisationen raderades"
@@ -3164,7 +3191,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."
   },
   "dontAskFingerprintAgain": {
-    "message": "Fråga inte om verifiering av fingeravtrycksfrasen igen",
+    "message": "Never prompt to verify fingerprint phrases for invited users (Not recommended)",
     "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."
   },
   "free": {
@@ -4214,7 +4241,7 @@
     "message": "The provider has been set up."
   },
   "clients": {
-    "message": "Clients"
+    "message": "Klienter"
   },
   "providerAdmin": {
     "message": "Provider Admin"
@@ -4381,7 +4408,7 @@
     "message": "Select SSO Type"
   },
   "type": {
-    "message": "Type"
+    "message": "Typ"
   },
   "openIdConnectConfig": {
     "message": "OpenID Connect Configuration"
diff --git a/src/locales/tr/messages.json b/src/locales/tr/messages.json
index b0b3dafe..bcb0250f 100644
--- a/src/locales/tr/messages.json
+++ b/src/locales/tr/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Güvenli not"
   },
+  "typeLoginPlural": {
+    "message": "Hesaplar"
+  },
+  "typeCardPlural": {
+    "message": "Kartlar"
+  },
+  "typeIdentityPlural": {
+    "message": "Kimlikler"
+  },
+  "typeSecureNotePlural": {
+    "message": "Güvenli Notlar"
+  },
   "folders": {
     "message": "Klasörler"
   },
@@ -1468,7 +1480,7 @@
     "message": "Açığa Çıkmış Parolalar Bulundu"
   },
   "exposedPasswordsFoundDesc": {
-    "message": "Kasanızda, bilinen veri ihlallerine maruz kalmış şifreleri olan $COUNT$ öge bulundu. Yeni bir şifre kullanmaları için onları değiştirmelisiniz.",
+    "message": "Kasanızda, bilinen veri ihlallerine maruz kalmış parolalara sahip $COUNT$ kayıt bulundu. Bu parolaları değiştirmelisiniz.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -1516,7 +1528,7 @@
     "message": "Yeniden Kullanılmış Parolalar Raporu"
   },
   "reusedPasswordsReportDesc": {
-    "message": "Kullandığınız bir servisin güvenliği ihlal edilirse, aynı parolayı başka bir yerde tekrar kullanmak bilgisayar korsanlarının çevrimiçi hesaplarınızın daha fazlasına kolayca erişmesine izin verebilir. Her hesap veya hizmet için benzersiz bir parola kullanmalısınız."
+    "message": "Kullandığınız bir servis ele geçirilirse, aynı parolayı başka yerlerde kullanmanız hacker'ların diğer hesaplarınıza da kolayca erişmesine olanak tanıyabilir. bu yüzden her hesap ve hizmet için farklı bir parola kullanmalısınız."
   },
   "reusedPasswordsFound": {
     "message": "Yeniden kullanılmış parolalar bulundu"
@@ -1546,7 +1558,7 @@
     "message": "Veri İhlali Raporu"
   },
   "breachDesc": {
-    "message": "\"İhlal\", bir sitenin verilerine bilgisayar korsanları tarafından yasa dışı bir şekilde erişildiği ve daha sonra herkese açık olarak yayınlandığı bir olaydır. Ele geçirilen veri türlerini (e-posta adresleri, parolalar, kredi kartları vb.) inceleyin ve parolaları değiştirmek gibi uygun işlemleri yapın."
+    "message": "Hacker'ların bir sitenin verilerine yasadışı bir şekilde erişip bunları herkese açık bir şekilde yayımlamalarına \"ihlal\" denir. Ele geçirilen veri türlerini (e-posta adresleri, parolalar, kredi kartları vb.) inceleyin ve gerekli önlemleri alın (örn. parolaları değiştirin)."
   },
   "breachCheckUsernameEmail": {
     "message": "Kullandığınız kullanıcı adlarını ve e-posta adreslerini kontrol edin."
@@ -1621,7 +1633,7 @@
     "description": "Dollar amount, or quantity."
   },
   "creditDelayed": {
-    "message": "Ödeme tamamlandıktan sonra eklenen kredi hesabınızda görünecektir. Bazı ödeme yöntemleri gecikmelidir ve diğerlerine göre daha uzun sürebilir."
+    "message": "Ödeme tamamlandıktan sonra eklenen kredi hesabınızda görünecektir. Bazı ödeme yöntemlerinin işlenmesi diğerlerine göre daha uzun sürebilir."
   },
   "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."
@@ -1884,10 +1896,10 @@
     "message": "Depolamadan çıkarılacak GB miktarı"
   },
   "storageAddNote": {
-    "message": "Depolama alanı eklemek, fatura toplamınızda ayarlamalar yapmanıza ve ödeme yönteminizi derhal borçlandırmanıza neden olur. İlk masraf, mevcut faturalandırma döngüsünün kalanı için geçerli olacaktır."
+    "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."
   },
   "storageRemoveNote": {
-    "message": "Depolamayı kaldırmak, bir sonraki fatura ücretinize kredi olarak kanıtlanacak olan fatura toplamlarınızda ayarlamalar yapmanıza neden olur."
+    "message": "Removing storage will result in adjustments to your billing totals that will be prorated as credits toward your next billing charge."
   },
   "adjustedStorage": {
     "message": "$AMOUNT$ GB depolama alanı ayarlandı.",
@@ -2051,7 +2063,7 @@
     }
   },
   "addShareLimitedUsers": {
-    "message": "$COUNT$ kullanıcıya kadar ekleyin ve paylaşın",
+    "message": "$COUNT$ kullanıcı ekleyin ve paylaşın",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2060,7 +2072,7 @@
     }
   },
   "addShareUnlimitedUsers": {
-    "message": "Sonsuz sayıda kullanıcı ekleyin ve paylaşın"
+    "message": "Sınırsız kullanıcı ekleyin ve paylaşın"
   },
   "createUnlimitedCollections": {
     "message": "Sınırsız koleksiyon oluşturma"
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Kuruluşu sil"
   },
-  "deleteOrganizationDesc": {
-    "message": "Bu kuruluşu ve ilişkili tüm verileri silmek için aşağıdan devam edin. Kullanıcı hesapları kalacak fakat bu kuruluşla ilişkileri kesilecektir. "
+  "deletingOrganizationContentWarning": {
+    "message": "$ORGANIZATION$ kuruluşunu ve tüm verilerini silmeyi onaylamak için ana parolayı girin. $ORGANIZATION$ kasa verileri şunları içerir:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Kuruluşu silmek kalıcıdır. Bu işlem geri alınamaz."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "Silme işleminin ardından kullanıcı hesapları aktif kalacaktır ama artık bu kuruluşa bağlı olmayacaklardır."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "$ORGANIZATION$ kuruluşunu silme işlemi kalıcıdır ve geri alınamaz.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Kuruluş silindi"
@@ -2801,7 +2828,7 @@
     "message": "Vergi bilgileri"
   },
   "taxInformationDesc": {
-    "message": "ABD'deki müşteriler için satış vergisi gereksinimlerini karşılamak adına Posta Kodu gereklidir. Diğer ülkeler için isteğe bağlı olarak, faturalarınızda görünmesi için, bir vergi numarası ve/veya adres ekleyebilirsiniz."
+    "message": "ABD'deki müşteriler için satış vergisi gereksinimlerini karşılamak adına posta kodu gereklidir. Diğer ülkeler için isteğe bağlı olarak, faturalarınızda görünecek bir vergi numarası ve/veya adres ekleyebilirsiniz."
   },
   "billingPlan": {
     "message": "Paket",
@@ -3328,7 +3355,7 @@
     "message": "Kayıtlar kalıcı olarak silindi"
   },
   "permanentlyDeleteSelectedItemsDesc": {
-    "message": "Silinmesi için $COUNT$ öge seçtiniz. Bu ögelerin tamamını kalıcı şekilde silmek istediğinizden emin misiniz?",
+    "message": "Kalıcı olarak silinmek üzere $COUNT$ kayıt seçtiniz. Bu kayıtların hepsini kalıcı olarak silmek istediğinizden emin misiniz?",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -3651,7 +3678,7 @@
     "message": "Acil durum kişisini düzenle"
   },
   "inviteEmergencyContactDesc": {
-    "message": "Aşağıya Bitwarden hesabının email adresini girerek yeni bir acil durum kişisini davet edebilirsiniz. Eğer halihazırda bir Bitwarden hesapları yoksa, yeni bir hesap oluşturmaları istenecektir."
+    "message": "Aşağıya Bitwarden hesabının e-posta adresini girerek yeni bir acil durum kişisi davet edebilirsiniz. Bu kişinin mevcut bir Bitwarden hesabı yoksa yeni bir hesap açması istenecektir."
   },
   "emergencyAccessRecoveryInitiated": {
     "message": "Acil durum erişimi başlatıldı"
@@ -4109,7 +4136,7 @@
     "message": "Yöneticilerin kullanıcıların ana parolalarını sıfırlayabilmesi önce kuruluştaki kullanıcıların kendileri katılmaları veya otomatik eklenmeleri gerekir."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Otomatik Eklenme"
+    "message": "Otomatik eklenme"
   },
   "resetPasswordPolicyAutoEnrollDescription": {
     "message": "Davetiyeleri kabul edildiğinde tüm kullanıcılar otomatik olarak parola sıfırlamaya eklenecek."
@@ -4492,7 +4519,7 @@
     "message": "Single Sign-On configuration was saved."
   },
   "sponsoredFamilies": {
-    "message": "Free Bitwarden Families"
+    "message": "Ücretsiz Bitwarden Aile"
   },
   "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."
@@ -4504,7 +4531,7 @@
     "message": "Bitwarden Aile paketinin özellikleri"
   },
   "sponsoredFamiliesPremiumAccess": {
-    "message": "Premium access for up to 6 users"
+    "message": "6 kullanıcı için premium erişim"
   },
   "sponsoredFamiliesSharedCollections": {
     "message": "Shared collections for Family secrets"
@@ -4549,7 +4576,7 @@
     }
   },
   "sponsoredFamiliesOffer": {
-    "message": "Accept Free Bitwarden Families"
+    "message": "Ücretsiz Bitwarden Aile'yi kabul et"
   },
   "sponsoredFamiliesOfferRedeemed": {
     "message": "Free Bitwarden Families offer successfully redeemed"
@@ -4720,7 +4747,7 @@
     "message": "Teklifi kabul et"
   },
   "sponsoringOrg": {
-    "message": "Sponsor Organizasyon"
+    "message": "Sponsor kuruluş"
   },
   "keyConnectorTest": {
     "message": "Test"
@@ -4729,7 +4756,7 @@
     "message": "Başarılı! Key Connector'a ulaşıldı."
   },
   "keyConnectorTestFail": {
-    "message": "Key Connector 'e ulaşılamadı. URL 'i kontrol edin."
+    "message": "Key Connector'e ulaşılamadı. URL 'i kontrol edin."
   },
   "sponsorshipTokenHasExpired": {
     "message": "Sponsorluk teklifinin süresi doldu."
@@ -4750,7 +4777,7 @@
     "message": "1 field above needs your attention."
   },
   "fieldRequiredError": {
-    "message": "$FIELDNAME$ is required.",
+    "message": "$FIELDNAME$ zorunludur.",
     "placeholders": {
       "fieldname": {
         "content": "$1",
@@ -4759,7 +4786,7 @@
     }
   },
   "required": {
-    "message": "required"
+    "message": "zorunlu"
   },
   "idpSingleSignOnServiceUrlRequired": {
     "message": "Required if Entity ID is not a URL."
diff --git a/src/locales/uk/messages.json b/src/locales/uk/messages.json
index 6306a619..69990eab 100644
--- a/src/locales/uk/messages.json
+++ b/src/locales/uk/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Захищена нотатка"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Cards"
+  },
+  "typeIdentityPlural": {
+    "message": "Identities"
+  },
+  "typeSecureNotePlural": {
+    "message": "Secure Notes"
+  },
   "folders": {
     "message": "Теки"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Видалити організацію"
   },
-  "deleteOrganizationDesc": {
-    "message": "Продовжуйте внизу, щоб видалити цю організацію і всі пов'язані дані. Індивідуальні облікові записи користувачів залишаться без змін, однак, вони більше не будуть пов'язані з цією організацією. "
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Видалення організації є незворотною дією. Її неможливо скасувати."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Організацію видалено"
diff --git a/src/locales/vi/messages.json b/src/locales/vi/messages.json
index 7023d088..8f1c2c4c 100644
--- a/src/locales/vi/messages.json
+++ b/src/locales/vi/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "Ghi chú bảo mật"
   },
+  "typeLoginPlural": {
+    "message": "Logins"
+  },
+  "typeCardPlural": {
+    "message": "Cards"
+  },
+  "typeIdentityPlural": {
+    "message": "Identities"
+  },
+  "typeSecureNotePlural": {
+    "message": "Secure Notes"
+  },
   "folders": {
     "message": "Thư mục"
   },
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "Delete Organization"
   },
-  "deleteOrganizationDesc": {
-    "message": "Proceed below to delete this organization and all associated data. Individual user accounts will remain, though they will not be associated to this organization anymore. "
+  "deletingOrganizationContentWarning": {
+    "message": "Enter the master password to confirm deletion of $ORGANIZATION$ and all associated data. Vault data in $ORGANIZATION$ includes:",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "Deleting the organization is permanent. It cannot be undone."
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "User accounts will remain active after deletion but will no longer be associated to this organization."
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "Deleting $ORGANIZATION$ is permanent and irreversible.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "Organization Deleted"
diff --git a/src/locales/zh_CN/messages.json b/src/locales/zh_CN/messages.json
index 9b3292fa..85254f93 100644
--- a/src/locales/zh_CN/messages.json
+++ b/src/locales/zh_CN/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "安全笔记"
   },
+  "typeLoginPlural": {
+    "message": "登录"
+  },
+  "typeCardPlural": {
+    "message": "支付卡"
+  },
+  "typeIdentityPlural": {
+    "message": "身份"
+  },
+  "typeSecureNotePlural": {
+    "message": "安全笔记"
+  },
   "folders": {
     "message": "文件夹"
   },
@@ -538,10 +550,10 @@
     "message": "否"
   },
   "loginOrCreateNewAccount": {
-    "message": "登录或者新建一个账号来访问您的安全密码库。"
+    "message": "登录或者新建一个账户来访问您的安全密码库。"
   },
   "createAccount": {
-    "message": "创建账号"
+    "message": "创建账户"
   },
   "logIn": {
     "message": "登录"
@@ -604,7 +616,7 @@
     "message": "两次填写的主密码不一致。"
   },
   "newAccountCreated": {
-    "message": "已经为您建立了帐户，您可以登录了。"
+    "message": "您的新账户已创建！您现在可以登录了。"
   },
   "masterPassSent": {
     "message": "我们已经为您发送了包含主密码提示的邮件。"
@@ -622,7 +634,7 @@
     "message": "解锁​​​​"
   },
   "loggedInAsEmailOn": {
-    "message": "已在 $HOSTNAME$ 以 $EMAIL$ 身份登入。",
+    "message": "已在 $HOSTNAME$ 上以 $EMAIL$ 身份登录。",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -746,7 +758,7 @@
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "u2fDesc": {
-    "message": "使用任何支持 FIDO U2F 的安全钥匙来访问您的帐户。"
+    "message": "使用任何支持 FIDO U2F 的安全钥匙来访问您的账户。"
   },
   "u2fTitle": {
     "message": "FIDO U2F 安全钥匙"
@@ -755,7 +767,7 @@
     "message": "FIDO2 WebAuthn"
   },
   "webAuthnDesc": {
-    "message": "使用任何启用了 WebAuthn 的安全钥匙访问您的帐户。"
+    "message": "使用任何启用了 WebAuthn 的安全钥匙访问您的账户。"
   },
   "webAuthnMigrated": {
     "message": "（迁移自 FIDO）"
@@ -898,13 +910,13 @@
     "description": "To clear something out. example: To clear browser history."
   },
   "accountUpdated": {
-    "message": "帐户已更新"
+    "message": "账户已更新"
   },
   "changeEmail": {
     "message": "更改电子邮件"
   },
   "changeEmailTwoFactorWarning": {
-    "message": "继续操作将更改您的帐户电子邮件地址。这不会更改用于双重身份验证的电子邮件地址。您可以在两步登录设置中更改它。"
+    "message": "继续操作将更改您的账户电子邮件地址。这不会更改用于双重身份验证的电子邮件地址。您可以在两步登录设置中更改它。"
   },
   "newEmail": {
     "message": "新电子邮件"
@@ -991,7 +1003,7 @@
     "message": "取消会话授权"
   },
   "deauthorizeSessionsDesc": {
-    "message": "您是否担心自己的帐号在其他设备上登录？请按照以下步骤取消对之前使用过的所有计算机或设备的授权。如果您以前使用过公共电脑或不小心曾将密码保存在不属于您的设备上，则建议执行此安全步骤。此步骤还将清除所有以前记住的两步登录会话。"
+    "message": "您是否担心自己的账户在其他设备上登录过？请按照以下步骤取消对之前使用过的所有计算机或设备的授权。如果您以前使用过公共电脑或不小心曾将密码保存在不属于您的设备上，则建议执行此安全步骤。此步骤还将清除所有以前记住的两步登录会话。"
   },
   "deauthorizeSessionsWarning": {
     "message": "接下来将会注销您当前的会话，并要求您重新登录。如果有设置两步登录，也需要重新认证。其他设备上的活动会话可能会继续保持最多一小时。"
@@ -1021,22 +1033,22 @@
     "message": "你的密码库已经被清空。"
   },
   "deleteAccount": {
-    "message": "删除帐户"
+    "message": "删除账户"
   },
   "deleteAccountDesc": {
-    "message": "接下来的操作会删除您的帐户和所有相关数据。"
+    "message": "接下来的操作会删除您的账户和所有相关数据。"
   },
   "deleteAccountWarning": {
-    "message": "删除帐户是永久性的。不能被撤消。"
+    "message": "删除账户是永久性的。不能被撤消。"
   },
   "accountDeleted": {
-    "message": "帐户已删除"
+    "message": "账户已删除"
   },
   "accountDeletedDesc": {
-    "message": "您的帐户已关闭，所有相关数据也已被删除。"
+    "message": "您的账户已关闭，所有相关数据也已被删除。"
   },
   "myAccount": {
-    "message": "我的帐户"
+    "message": "我的账户"
   },
   "tools": {
     "message": "工具"
@@ -1171,13 +1183,13 @@
     "message": "两步登录"
   },
   "twoStepLoginDesc": {
-    "message": "在登录时需要额外的步骤来保护您的帐户。"
+    "message": "在登录时需要额外的步骤来保护您的账户。"
   },
   "twoStepLoginOrganizationDesc": {
     "message": "在组织机构层面配置提供程序，以要求你组织的用户采用两步登录。"
   },
   "twoStepLoginRecoveryWarning": {
-    "message": "启用两步登录可能会将您永久锁定在 Bitwarden 帐户之外。如果您无法使用常规的两步登录提供程序（例如您丢失了设备），则可以使用恢复代码访问您的帐户。如果您失去对您帐户的访问，Bitwarden 支持也无法帮助您。我们建议您记下或打印恢复代码，并将其妥善保管。"
+    "message": "启用两步登录可能会将您永久锁定在 Bitwarden 账户之外。如果您无法使用常规的两步登录提供程序（例如您丢失了设备），则可以使用恢复代码访问您的账户。如果您失去对您账户的访问，Bitwarden 支持也无法帮助您。我们建议您记下或打印恢复代码，并将其妥善保管。"
   },
   "viewRecoveryCode": {
     "message": "查看恢复代码"
@@ -1218,7 +1230,7 @@
     "message": "停用"
   },
   "twoStepLoginProviderEnabled": {
-    "message": "您的帐户已启用此两步登录提供程序。"
+    "message": "您的账户已启用此两步登录提供程序。"
   },
   "twoStepLoginAuthDesc": {
     "message": "输入主密码以修改两步登录设置。"
@@ -1263,7 +1275,7 @@
     "message": "此两步登录提供程序已禁用。"
   },
   "twoFactorYubikeyAdd": {
-    "message": "将新的 YubiKey 添加到您的帐户"
+    "message": "将新的 YubiKey 添加到您的账户"
   },
   "twoFactorYubikeyPlugIn": {
     "message": "将 YubiKey 插入您电脑的 USB 端口。"
@@ -1278,7 +1290,7 @@
     "message": "保存表单。"
   },
   "twoFactorYubikeyWarning": {
-    "message": "由于平台的限制，YubiKey 不能在所有 Bitwarden 应用程序上使用。您应该启用另一个两步登录提供程序，以便在无法使用 YubiKey 时可以访问您的帐户。支持的平台："
+    "message": "由于平台的限制，YubiKey 不能在所有 Bitwarden 应用程序上使用。您应该启用另一个两步登录提供程序，以便在无法使用 YubiKey 时可以访问您的账户。支持的平台："
   },
   "twoFactorYubikeySupportUsb": {
     "message": "具有 USB 端口的设备上的网页版密码库、桌面应用程序、CLI 以及浏览器扩展都可以使用您的 YubiKey。"
@@ -1353,13 +1365,13 @@
     "message": "发送电子邮件"
   },
   "twoFactorU2fAdd": {
-    "message": "在您的帐户中添加 FIDO U2F 安全钥匙"
+    "message": "在您的账户中添加 FIDO U2F 安全钥匙"
   },
   "removeU2fConfirmation": {
     "message": "您确认要删除这个安全钥匙吗？"
   },
   "twoFactorWebAuthnAdd": {
-    "message": "添加一个 WebAuthn 安全密钥到您的帐户"
+    "message": "添加一个 WebAuthn 安全密钥到您的账户"
   },
   "readKey": {
     "message": "读取钥匙"
@@ -1380,7 +1392,7 @@
     "message": "保存表单。"
   },
   "twoFactorU2fWarning": {
-    "message": "由于平台的限制，FIDO U2F 不能在所有 Bitwarden 应用程序上使用。您应该启用另一个两步登录提供程序，以便在无法使用 FIDO U2F 时可以访问您的帐户。 支持的平台："
+    "message": "由于平台的限制，FIDO U2F 不能在所有 Bitwarden 应用程序上使用。您应该启用另一个两步登录提供程序，以便在无法使用 FIDO U2F 时可以访问您的账户。支持的平台："
   },
   "twoFactorU2fSupportWeb": {
     "message": "台式机 / 笔记本电脑上启用了 U2F 的浏览器（Chrome，Opera，Vivaldi 或启用了 FIDO U2F 的 Firefox）中的网页版密码库和浏览器扩展。"
@@ -1395,7 +1407,7 @@
     "message": "读取安全钥匙时出现问题，请再试一次。"
   },
   "twoFactorWebAuthnWarning": {
-    "message": "由于平台限制，无法在所有 Bitwarden 应用程序中使用 WebAuthn。您应该启用另一种两步登录方式，以便在 WebAuthn 无法使用时可以访问您的帐户。支持的平台有："
+    "message": "由于平台限制，无法在所有 Bitwarden 应用程序中使用 WebAuthn。您应该启用另一种两步登录方式，以便在 WebAuthn 无法使用时可以访问您的账户。支持的平台有："
   },
   "twoFactorWebAuthnSupportWeb": {
     "message": "桌面/笔记本电脑上具有 WebAuthn 功能的浏览器（Chrome、Opera、Vivaldi 或启用了 FIDO U2F 的 Firefox）上的网页密码库和浏览器扩展。"
@@ -1438,7 +1450,7 @@
     "message": "未激活 2FA 报告"
   },
   "inactive2faReportDesc": {
-    "message": "双重身份验证（2FA）是保护您帐户安全的一个重要安全设置。如果网站提供双重身份验证，您应该始终启用它。"
+    "message": "双重身份验证（2FA）是保护您账户安全的一个重要安全设置。如果网站提供双重身份验证，您应该始终启用它。"
   },
   "inactive2faFound": {
     "message": "发现未使用双重身份验证的登录"
@@ -1516,7 +1528,7 @@
     "message": "重复使用密码报告"
   },
   "reusedPasswordsReportDesc": {
-    "message": "如果您使用的服务被盗，在其他地方重复使用相同的密码可以让黑客轻松访问您的更多在线帐户。您应该对每个帐户或服务使用不同的密码。"
+    "message": "如果您使用的服务被盗，在其他地方重复使用相同的密码可以让黑客轻松访问您的更多在线账户。您应该对每个账户或服务使用不同的密码。"
   },
   "reusedPasswordsFound": {
     "message": "发现重复使用的密码"
@@ -1581,7 +1593,7 @@
     }
   },
   "breachFound": {
-    "message": "发现被泄露的帐户"
+    "message": "发现被泄露的账户"
   },
   "compromisedData": {
     "message": "被盗数据"
@@ -1621,10 +1633,10 @@
     "description": "Dollar amount, or quantity."
   },
   "creditDelayed": {
-    "message": "添加的信用额度在付款全部处理后将出现在您的帐户上。某些付款方式会延迟，并且可能需要比其他付款方式更长的时间来处理。"
+    "message": "添加的信用额度在付款全部处理后将出现在您的账户上。某些付款方式会延迟，并且可能需要比其他付款方式更长的时间来处理。"
   },
   "makeSureEnoughCredit": {
-    "message": "请确保您的帐户有足够的信用额度来用于此购买。如果您的帐户信用额度不足，您的默认付款方式将用于补足差额。您可以从计费页面向您的帐户添加信用额度。"
+    "message": "请确保您的账户有足够的信用额度来用于此购买。如果您的账户信用额度不足，您的默认付款方式将用于补足差额。您可以从计费页面向您的账户添加信用额度。"
   },
   "creditAppliedDesc": {
     "message": "您帐户的信用额度可用于进行消费。任何可用的信用额度将用于自动支付此帐户的账单。"
@@ -1637,7 +1649,7 @@
     "message": "您已升级到高级会员。"
   },
   "premiumUpgradeUnlockFeatures": {
-    "message": "将您的帐户升级为高级会员，将解锁一些强大的附加功能。"
+    "message": "将您的账户升级为高级会员，将解锁一些强大的附加功能。"
   },
   "premiumSignUpStorage": {
     "message": "1 GB 文件附件加密存储。"
@@ -1752,7 +1764,7 @@
     "message": "支付卡"
   },
   "paypalClickSubmit": {
-    "message": "点击 PayPal 按钮登录您的 PayPal 账户，然后点击 提交 按钮。"
+    "message": "点击 PayPal 按钮登录您的 PayPal 账户，然后点击下面的提交按钮继续。"
   },
   "cancelSubscription": {
     "message": "取消订阅"
@@ -1764,7 +1776,7 @@
     "message": "待取消"
   },
   "subscriptionPendingCanceled": {
-    "message": "订阅在当前计费周期结束前已标记为取消。"
+    "message": "此订阅在当前计费周期结束前已标记为取消。"
   },
   "reinstateSubscription": {
     "message": "恢复订阅"
@@ -1920,7 +1932,7 @@
     }
   },
   "uploadLicenseFilePremium": {
-    "message": "要将您的帐户升级为高级会员资格，您需要上传有效的许可证文件。"
+    "message": "要将您的账户升级为高级会员资格，您需要上传有效的许可证文件。"
   },
   "uploadLicenseFileOrg": {
     "message": "若要创建基于本地托管的组织，您需要上传有效的许可证文件。"
@@ -1938,7 +1950,7 @@
     "message": "组织名称"
   },
   "accountOwnedBusiness": {
-    "message": "此帐户由公司拥有。"
+    "message": "此账户由商业用户拥有。"
   },
   "billingEmail": {
     "message": "账单电子邮件"
@@ -2177,7 +2189,7 @@
     "message": "您确实要删除此用户吗？"
   },
   "removeUserConfirmationKeyConnector": {
-    "message": "警告！此用户需要 Key Connector 来管理他们的加密。从您的组织中移除此用户将永久禁用他们的帐户。此操作无法撤消。您要继续吗？"
+    "message": "警告！此用户需要 Key Connector 来管理他们的加密。从您的组织中移除此用户将永久禁用他们的账户。此操作无法撤消。您要继续吗？"
   },
   "externalId": {
     "message": "外部 ID"
@@ -2216,7 +2228,7 @@
     "message": "邀请用户"
   },
   "inviteUserDesc": {
-    "message": "在下面输入 Bitwarden 帐户的电子邮件地址，以邀请新用户加入您的组织。如果他们没有 Bitwarden 帐户，将会提示他们创建一个。"
+    "message": "在下面输入 Bitwarden 账户的电子邮件地址，以邀请新用户加入您的组织。如果他们没有 Bitwarden 账户，将会提示他们创建一个。"
   },
   "inviteMultipleEmailDesc": {
     "message": "通过使用逗号分隔的电子邮件地址列表，您可以一次邀请 $COUNT$ 位用户。",
@@ -2228,7 +2240,7 @@
     }
   },
   "userUsingTwoStep": {
-    "message": "此用户正在使用两步登录来保护他们的帐户。"
+    "message": "此用户正在使用两步登录来保护他们的账户。"
   },
   "userAccessAllItems": {
     "message": "此用户可以访问和修改所有项目。"
@@ -2315,7 +2327,7 @@
     "message": "已登录。"
   },
   "changedPassword": {
-    "message": "帐户密码已更改。"
+    "message": "账户密码已更改。"
   },
   "enabledUpdated2fa": {
     "message": "已启用/更新两步登录。"
@@ -2324,7 +2336,7 @@
     "message": "两步登录已禁用。"
   },
   "recovered2fa": {
-    "message": "已从两步登录中恢复帐户。"
+    "message": "已从两步登录中恢复账户。"
   },
   "failedLogin": {
     "message": "登录失败，密码不正确。"
@@ -2705,7 +2717,7 @@
     "message": "验证您账户的电子邮件地址来解锁所有功能。"
   },
   "verifyEmailFirst": {
-    "message": "首先必须验证您帐户的电子邮件地址。"
+    "message": "首先必须验证您账户的电子邮件地址。"
   },
   "checkInboxForVerification": {
     "message": "检查您的电子邮件收件箱以获取验证链接。"
@@ -2744,7 +2756,7 @@
     "message": "无法接受邀请。请向组织管理员请求发送新的邀请。"
   },
   "inviteAcceptFailedShort": {
-    "message": "无法接受邀请。 $DESCRIPTION$",
+    "message": "无法接受邀请。$DESCRIPTION$",
     "placeholders": {
       "description": {
         "content": "$1",
@@ -2756,25 +2768,25 @@
     "message": "记住电子邮件"
   },
   "recoverAccountTwoStepDesc": {
-    "message": "如果您无法通过常规的两步登录方式访问您的帐户，您可以使用两步登录恢复代码来禁用帐户上的所有两步登录提供程序。"
+    "message": "如果您无法通过常规的两步登录方式访问您的账户，您可以使用两步登录恢复代码来禁用账户上的所有两步登录提供程序。"
   },
   "recoverAccountTwoStep": {
-    "message": "恢复帐户两步登录"
+    "message": "恢复账户两步登录"
   },
   "twoStepRecoverDisabled": {
-    "message": "您的帐户已禁用两步登录。"
+    "message": "您的账户已禁用两步登录。"
   },
   "learnMore": {
     "message": "进一步了解"
   },
   "deleteRecoverDesc": {
-    "message": "请在下面输入您的电子邮件地址以恢复和删除您的帐户。"
+    "message": "请在下面输入您的电子邮件地址以恢复和删除您的账户。"
   },
   "deleteRecoverEmailSent": {
     "message": "如果您的帐户存在，我们已经向您发送了电子邮件，其中包含了进一步说明。"
   },
   "deleteRecoverConfirmDesc": {
-    "message": "您已请求删除您的 Bitwarden 帐户。单击下面的按钮以确认。"
+    "message": "您已请求删除您的 Bitwarden 账户。单击下面的按钮以确认。"
   },
   "myOrganization": {
     "message": "我的组织"
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "删除组织"
   },
-  "deleteOrganizationDesc": {
-    "message": "接下来将删除该组织和所有相关数据。个人用户帐户将保留，但不再与该组织关联。 "
+  "deletingOrganizationContentWarning": {
+    "message": "请输入主密码以确认删除 $ORGANIZATION$ 及关联的所有数据。$ORGANIZATION$ 中的密码库数据包括：",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "删除组织是永久的，不能被撤消。"
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "删除后用户账户仍可用，但不再与此组织关联。"
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "删除 $ORGANIZATION$ 是永久操作，不可撤销！",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "组织已删除"
@@ -2812,7 +2839,7 @@
     "description": "A billing plan/package. For example: families, teams, enterprise, etc."
   },
   "changeBillingPlanUpgrade": {
-    "message": "为了将您的帐户升级到另一个计划，请提供以下信息。同时请确保您账户已添加有一个有效的支付方式。",
+    "message": "为了将您的账户升级到另一个计划，请提供以下信息。同时请确保您账户已添加有一个有效的支付方式。",
     "description": "A billing plan/package. For example: families, teams, enterprise, etc."
   },
   "invoiceNumber": {
@@ -2832,7 +2859,7 @@
     "message": "下载账单"
   },
   "verifyBankAccount": {
-    "message": "验证银行帐户"
+    "message": "验证银行账户"
   },
   "verifyBankAccountDesc": {
     "message": "我们已将两笔小额转账存入您的银行账户（将会在 1-2 个工作日到账）。输入这些金额来验证银行账户。"
@@ -2864,19 +2891,19 @@
     "description": "Bank account routing number"
   },
   "accountNumber": {
-    "message": "帐户号码"
+    "message": "账户号码"
   },
   "accountHolderName": {
-    "message": "帐户持有人姓名"
+    "message": "账户持有人姓名"
   },
   "bankAccountType": {
-    "message": "帐户类型"
+    "message": "账户类型"
   },
   "bankAccountTypeCompany": {
-    "message": "公司"
+    "message": "公司（商业）"
   },
   "bankAccountTypeIndividual": {
-    "message": "个人"
+    "message": "个体（个人）"
   },
   "enterInstallationId": {
     "message": "输入您的安装 ID"
@@ -3035,7 +3062,7 @@
     "message": "创建组织：第一步"
   },
   "createOrganizationCreatePersonalAccount": {
-    "message": "在创建组织之前，首先需要创建一个免费的个人帐户。"
+    "message": "在创建组织之前，首先需要创建一个免费的个人账户。"
   },
   "refunded": {
     "message": "退款"
@@ -3134,13 +3161,13 @@
     "message": "您选择的主密码较弱。您应该使用强密码（或密码短语）来正确保护您的 Bitwarden 账户。仍要使用此主密码吗？"
   },
   "rotateAccountEncKey": {
-    "message": "同时轮换帐户的加密密钥"
+    "message": "同时轮换账户的加密密钥"
   },
   "rotateEncKeyTitle": {
     "message": "轮换加密密钥"
   },
   "rotateEncKeyConfirmation": {
-    "message": "您确定要轮换帐户的加密密钥吗？"
+    "message": "您确定要轮换账户的加密密钥吗？"
   },
   "attachmentsNeedFix": {
     "message": "此项目有需要修复的旧文件附件。"
@@ -3153,7 +3180,7 @@
     "description": "This is a verb. ex. 'Fix The Car'"
   },
   "oldAttachmentsNeedFixDesc": {
-    "message": "需要先修复密码库中的旧文件附件，然后才能轮换帐户的加密密钥。"
+    "message": "需要先修复密码库中的旧文件附件，然后才能轮换账户的加密密钥。"
   },
   "yourAccountsFingerprint": {
     "message": "您的账户的指纹短语",
@@ -3224,13 +3251,13 @@
     "message": "设置主密码强度的最低要求。"
   },
   "twoStepLoginPolicyDesc": {
-    "message": "要求用户在个人帐户上设置两步登录。"
+    "message": "要求用户在个人账户上设置两步登录。"
   },
   "twoStepLoginPolicyWarning": {
     "message": "非所有者或管理员并且其个人账户未启用两步登录的组织成员将从组织中移除，并将收到一封关于此更改的电子邮件通知。"
   },
   "twoStepLoginPolicyUserWarning": {
-    "message": "您的组织要求您在您的个人账户上启用两步登录。 如果您禁用所有两步登录提供程序，您将自动被这些组织移除。"
+    "message": "您的组织要求您在您的个人账户上启用两步登录。如果您禁用所有两步登录提供程序，您将自动从这些组织中移除。"
   },
   "passwordGeneratorPolicyDesc": {
     "message": "设置密码生成器配置的最低要求。"
@@ -3457,7 +3484,7 @@
     "message": "限制用户加入任何其他组织。"
   },
   "singleOrgBlockCreateMessage": {
-    "message": "您当前的组织策略禁止您加入多个组织。请联系您的组织管理员，或从其他 Bitwarden 帐户注册。"
+    "message": "您当前的组织策略禁止您加入多个组织。请联系您的组织管理员，或从其他 Bitwarden 账户注册。"
   },
   "singleOrgPolicyWarning": {
     "message": "不是所有者或管理员并且已是其他组织的成员的组织成员将从您的组织中移除。"
@@ -3651,7 +3678,7 @@
     "message": "编辑紧急联系人"
   },
   "inviteEmergencyContactDesc": {
-    "message": "通过在下面输入他们的 Bitwarden 帐户电子邮件地址来邀请新的紧急联系人。 如果他们还没有 Bitwarden 帐户，将提示创建一个新帐户。"
+    "message": "通过在下面输入他们的 Bitwarden 账户电子邮件地址来邀请新的紧急联系人。 如果他们还没有 Bitwarden 账户，将提示创建一个新账户。"
   },
   "emergencyAccessRecoveryInitiated": {
     "message": "紧急访问已发起"
@@ -3666,7 +3693,7 @@
     "message": "接管"
   },
   "takeoverDesc": {
-    "message": "可以使用新的主密码重置您的帐户。"
+    "message": "可以使用新的主密码重置您的账户。"
   },
   "waitTime": {
     "message": "等待时间"
@@ -3690,7 +3717,7 @@
     "message": "已邀请用户。"
   },
   "acceptEmergencyAccess": {
-    "message": "您已被邀请成为上面所列用户的紧急联系人。要接受邀请，您需要登录或创建一个新的 Bitwarden 帐户。"
+    "message": "您已被邀请成为上面所列用户的紧急联系人。要接受邀请，您需要登录或创建一个新的 Bitwarden 账户。"
   },
   "emergencyInviteAcceptFailed": {
     "message": "无法接受邀请。请向用户请求发送新的邀请。"
@@ -3735,7 +3762,7 @@
     "message": "拒绝"
   },
   "approveAccessConfirmation": {
-    "message": "您确定要批准紧急访问吗？这将允许 $USER$  $ACTION$ 您的帐户。",
+    "message": "您确定要批准紧急访问吗？这将允许 $USER$  $ACTION$ 您的账户。",
     "placeholders": {
       "user": {
         "content": "$1",
@@ -4202,7 +4229,7 @@
     "message": "提供商设置"
   },
   "setupProviderLoginDesc": {
-    "message": "您已被邀请设置一个新的提供商。要继续，您需要登录或创建一个新的 Bitwarden 帐户。"
+    "message": "您已被邀请设置一个新的提供商。要继续，您需要登录或创建一个新的 Bitwarden 账户。"
   },
   "setupProviderDesc": {
     "message": "请在下面输入详细信息以完成提供商设置。如果您有任何疑问，请联系客户支持。"
@@ -4229,13 +4256,13 @@
     "message": "服务用户可以访问和管理所有客户组织。"
   },
   "providerInviteUserDesc": {
-    "message": "通过在下面输入他们的 Bitwarden 帐户电子邮件地址，邀请新用户加入您的提供商。如果他们还没有 Bitwarden 帐户，将被提示创建一个新的帐户。"
+    "message": "通过在下面输入他们的 Bitwarden 账户电子邮件地址，邀请新用户加入您的提供商。如果他们还没有 Bitwarden 账户，将被提示创建一个新的账户。"
   },
   "joinProvider": {
     "message": "加入提供商"
   },
   "joinProviderDesc": {
-    "message": "您已被邀请加入上面列出的提供商。要接受邀请，您需要登录或创建一个新的 Bitwarden 帐户。"
+    "message": "您已被邀请加入上面列出的提供商。要接受邀请，您需要登录或创建一个新的 Bitwarden 账户。"
   },
   "providerInviteAcceptFailed": {
     "message": "无法接受邀请。请联系提供商管理员发送新的邀请。"
@@ -4417,22 +4444,22 @@
     "message": "从用户信息端点获取声明"
   },
   "additionalScopes": {
-    "message": "额外/自定义范围（逗号分隔）"
+    "message": "自定义范围"
   },
   "additionalUserIdClaimTypes": {
-    "message": "额外/自定义用户 ID 声明类型（逗号分隔）"
+    "message": "自定义用户 ID 声明类型"
   },
   "additionalEmailClaimTypes": {
-    "message": "额外/自定义电子邮件声明类型（逗号分隔）"
+    "message": "电子邮件声明类型"
   },
   "additionalNameClaimTypes": {
-    "message": "额外/自定义名称声明类型 （逗号分隔）"
+    "message": "自定义名称声明类型"
   },
   "acrValues": {
-    "message": "请求的身份验证上下文类参考值（acr_value）"
+    "message": "请求的身份验证上下文类参考值"
   },
   "expectedReturnAcrValue": {
-    "message": "响应中预期的「acr」声明值（acr 认证）"
+    "message": "响应中预期的「acr」声明值"
   },
   "spEntityId": {
     "message": "SP 实体 ID"
@@ -4537,7 +4564,7 @@
     "message": "您已被邀请加入 Bitwarden 家庭计划组织。要继续，您需要登录到接受邀请的账户。"
   },
   "sponsoredFamiliesAcceptFailed": {
-    "message": "无法接受邀请。请重新发送来自您企业帐户的邀请邮件，然后重试。"
+    "message": "无法接受邀请。请重新发送来自您企业账户的邀请邮件，然后重试。"
   },
   "sponsoredFamiliesAcceptFailedShort": {
     "message": "无法接受邀请。$DESCRIPTION$",
@@ -4603,7 +4630,7 @@
     "message": "电子邮件已发送"
   },
   "revokeSponsorshipConfirmation": {
-    "message": "移除这个帐户后，家庭组织的所有者将负责此订阅及其相关的账单。您确定要继续吗？"
+    "message": "移除这个账户后，家庭组织的所有者将负责此订阅及其相关的账单。您确定要继续吗？"
   },
   "removeSponsorshipSuccess": {
     "message": "赞助已移除"
@@ -4765,7 +4792,7 @@
     "message": "如果实体 ID 不是一个 URL，则必填。"
   },
   "openIdOptionalCustomizations": {
-    "message": "可选自定义"
+    "message": "可选定制"
   },
   "openIdAuthorityRequired": {
     "message": "如果授权无效，则必填。"
diff --git a/src/locales/zh_TW/messages.json b/src/locales/zh_TW/messages.json
index 7130c90f..4781cdea 100644
--- a/src/locales/zh_TW/messages.json
+++ b/src/locales/zh_TW/messages.json
@@ -300,6 +300,18 @@
   "typeSecureNote": {
     "message": "安全筆記"
   },
+  "typeLoginPlural": {
+    "message": "登入"
+  },
+  "typeCardPlural": {
+    "message": "支付卡"
+  },
+  "typeIdentityPlural": {
+    "message": "身分"
+  },
+  "typeSecureNotePlural": {
+    "message": "安全筆記"
+  },
   "folders": {
     "message": "資料夾"
   },
@@ -520,7 +532,7 @@
     "message": "已登出"
   },
   "loginExpired": {
-    "message": "您的登入會話已逾期。"
+    "message": "您的登入工作階段已逾期。"
   },
   "logOutConfirmation": {
     "message": "您確定要登出嗎？"
@@ -622,7 +634,7 @@
     "message": "解鎖"
   },
   "loggedInAsEmailOn": {
-    "message": "已在 $HOSTNAME$ 以 $EMAIL$ 身份登入。",
+    "message": "已在 $HOSTNAME$ 上以 $EMAIL$ 身份登入。",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -922,7 +934,7 @@
     }
   },
   "loggedOutWarning": {
-    "message": "接下來會登出目前會話，並要求您重新登入。其他裝置上的活動會話最多會保持一個小時。"
+    "message": "接下來會登出目前工作階段，並要求您重新登入帳戶。其他裝置上的工作階段最多會保持一個小時。"
   },
   "emailChanged": {
     "message": "電子郵件已變更"
@@ -988,16 +1000,16 @@
     "message": "小心，這些動作無法復原！"
   },
   "deauthorizeSessions": {
-    "message": "取消會話授權"
+    "message": "取消工作階段授權"
   },
   "deauthorizeSessionsDesc": {
-    "message": "您是否擔心自己的帳戶在其他裝置上登入？請遵照以下步驟取消對之前使用過的所有計算機和裝置的授權。如果您以前使用過公共計算機或不小心曾將密碼儲存在不屬於您的裝置上，則建議執行此安全步驟，此操作還將清除所有以前記住的兩步驟登入會話。"
+    "message": "您是否擔心自己的帳戶在其他裝置上保持登入？請遵照以下步驟取消對之前使用過的所有電腦和裝置的授權。若您以前使用過公用電腦或不小心曾將密碼儲存在不屬於您的裝置上，則建議執行此安全步驟，此操作還將清除所有以前記住的兩步驟登入工作階段。"
   },
   "deauthorizeSessionsWarning": {
-    "message": "接下來會登出目前的會話，并要求您重新登入。若您有設定兩步驟登入，也需重新認證。其他裝置上的活動會話最多可能會保持一個小時。"
+    "message": "接下來會登出目前的工作階段，並要求您重新登入。若您有設定兩步驟登入，也需重新認證。其他裝置上的活動工作階段最多會保持一個小時。"
   },
   "sessionsDeauthorized": {
-    "message": "所有會話已取消授權"
+    "message": "已取消所有工作階段授權"
   },
   "purgeVault": {
     "message": "清空密碼庫"
@@ -1492,16 +1504,16 @@
     }
   },
   "weakPasswordsReport": {
-    "message": "弱強度密碼報告"
+    "message": "弱式密碼報告"
   },
   "weakPasswordsReportDesc": {
-    "message": "弱密碼可以輕易的被駭客和用於破解密碼的自動化工具猜中。Bitwarden 密碼生成器可以幫助您創建強密碼。"
+    "message": "弱式密碼很容易被駭客用破解密碼的自動化工具猜中。Bitwarden 密碼產生器可以幫助您建立強式密碼。"
   },
   "weakPasswordsFound": {
-    "message": "發現弱密碼"
+    "message": "發現弱式密碼"
   },
   "weakPasswordsFoundDesc": {
-    "message": "我們在您的密碼庫中發現了 $COUNT$ 個使用弱密碼的項目。您應該將它們變更為更強的密碼。",
+    "message": "我們在您的密碼庫中發現了 $COUNT$ 個使用弱式密碼的項目。您應該將它們變更為更強的密碼。",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -1510,7 +1522,7 @@
     }
   },
   "noWeakPasswords": {
-    "message": "您的密碼庫中沒有項目具有弱密碼。"
+    "message": "您的密碼庫中沒有項目具有弱式密碼。"
   },
   "reusedPasswordsReport": {
     "message": "重複使用密碼報告"
@@ -1764,7 +1776,7 @@
     "message": "待取消"
   },
   "subscriptionPendingCanceled": {
-    "message": "訂閱在當期計費周期结束前已標記為取消。"
+    "message": "此訂閱在當期計費周期结束前已標記為取消。"
   },
   "reinstateSubscription": {
     "message": "重新開始訂閱"
@@ -1923,7 +1935,7 @@
     "message": "要升級您的帳戶為進階版會員，您需要上傳有效的授權檔案。"
   },
   "uploadLicenseFileOrg": {
-    "message": "要創建基於內部託管的組織，您需要上傳有效的授權檔案。"
+    "message": "要建立基於內部託管的組織，您需要上傳有效的授權檔案。"
   },
   "accountEmailMustBeVerified": {
     "message": "必須驗證您帳戶的電子郵件位址。"
@@ -2216,7 +2228,7 @@
     "message": "邀請使用者"
   },
   "inviteUserDesc": {
-    "message": "在下面輸入 Bitwarden 賬戶的電子郵件位址，以邀請新使用者加入您的組織。如果他們沒有 Bitwarden 賬戶，將提示他們創建一個。"
+    "message": "在下方輸入 Bitwarden 帳戶的電子郵件位址，以邀請新使用者加入您的組織。若他們沒有 Bitwarden 帳戶，系統將提示他們建立新帳戶。"
   },
   "inviteMultipleEmailDesc": {
     "message": "透過使用逗號分隔的電子郵件位址，您可以一次性邀請 $COUNT$ 位使用者。",
@@ -2594,7 +2606,7 @@
     }
   },
   "createdOrganizationId": {
-    "message": "已創建組織 $ID$。",
+    "message": "已建立組織 $ID$。",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2732,7 +2744,7 @@
     "message": "加入組織"
   },
   "joinOrganizationDesc": {
-    "message": "您已被邀請加入上面的組織。要接受邀請，您需要登錄或創建新的 Bitwarden 帳戶。"
+    "message": "您已被邀請加入以上組織。若想接受邀請，您需要登入或建立新的 Bitwarden 帳戶。"
   },
   "inviteAccepted": {
     "message": "邀請已接受"
@@ -2782,11 +2794,26 @@
   "deleteOrganization": {
     "message": "刪除組織"
   },
-  "deleteOrganizationDesc": {
-    "message": "接下來將刪除此組織和所有關聯的數據。個人使用者帳戶將保留，但它們不再與此組織關聯。 "
+  "deletingOrganizationContentWarning": {
+    "message": "輸入主密碼以確認刪除 $ORGANIZATION$ 及與之關聯的所有資料。$ORGANIZATION$ 中的密碼庫資料包含：",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
-  "deleteOrganizationWarning": {
-    "message": "刪除組織是永久性的。這無法撤銷。"
+  "deletingOrganizationActiveUserAccountsWarning": {
+    "message": "刪除後，使用者帳號仍會維持可用狀態，但將斷開與本組織的關聯。"
+  },
+  "deletingOrganizationIsPermanentWarning": {
+    "message": "刪除 $ORGANIZATION$ 是永久且不可逆的。",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
   },
   "organizationDeleted": {
     "message": "組織已刪除"
@@ -3032,10 +3059,10 @@
     "message": "免費組織不提供此功能。切換到付費方案以解鎖更多功能。"
   },
   "createOrganizationStep1": {
-    "message": "創建組織：步驟 1"
+    "message": "建立組織：步驟 1"
   },
   "createOrganizationCreatePersonalAccount": {
-    "message": "在創建組織之前，首先需要創建一個免費的個人帳戶。"
+    "message": "在建立組織之前，首先需要建立一個免費的個人帳戶。"
   },
   "refunded": {
     "message": "已退款"
@@ -3190,7 +3217,7 @@
     "message": "您的 API 金鑰是另一種身分認證機制，請嚴格保密。"
   },
   "oauth2ClientCredentials": {
-    "message": "OAuth 2.0 客戶端證書",
+    "message": "OAuth 2.0 用戶端憑證",
     "description": "'OAuth 2.0' is a programming protocol. It should probably not be translated."
   },
   "viewApiKey": {
@@ -3487,7 +3514,7 @@
     "message": "文字"
   },
   "createSend": {
-    "message": "創建新的 Send",
+    "message": "建立新的 Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editSend": {
@@ -3495,7 +3522,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createdSend": {
-    "message": "Send 已創建",
+    "message": "Send 已建立",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editedSend": {
@@ -3690,7 +3717,7 @@
     "message": "已邀請使用者。"
   },
   "acceptEmergencyAccess": {
-    "message": "您已被邀請成為上述使用者的緊急聯絡人。要接受邀請，您需要登入或創建新的 Bitwarden 帳戶。"
+    "message": "您已被邀請成為上述使用者的緊急聯絡人。要接受邀請，您需要登入或建立新的 Bitwarden 帳戶。"
   },
   "emergencyInviteAcceptFailed": {
     "message": "無法接受邀請。請向使用者請求傳送一個新的邀請。"
@@ -3778,7 +3805,7 @@
     "message": "停用 Send"
   },
   "disableSendPolicyDesc": {
-    "message": "不允許使用者創建或編輯 Bitwarden Send。但允許刪除現有的 Send。",
+    "message": "不允許使用者建立或編輯 Bitwarden Send。但允許刪除現有的 Send。",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "disableSendExemption": {
@@ -3797,21 +3824,21 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendOptionsPolicyDesc": {
-    "message": "設定用於創建和編輯 Send 的選項。",
+    "message": "設定用於建立和編輯 Send 的選項。",
     "description": "'Sends' is a plural noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendOptionsExemption": {
     "message": "可以管理組織原則的組織使用者豁免此原則的執行。"
   },
   "disableHideEmail": {
-    "message": "不允許使用者在創建或編輯 Send 時隱藏他們的電子郵件位址。",
+    "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 時不允許隱藏他們的電子郵件位址。",
+    "message": "使用者在建立或編輯 Send 時不允許隱藏他們的電子郵件位址。",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "modifiedPolicyId": {
@@ -3854,7 +3881,7 @@
     "message": "管理所有集合。"
   },
   "createNewCollections": {
-    "message": "創建新的集合"
+    "message": "建立新的集合"
   },
   "editAnyCollection": {
     "message": "編輯任何集合"
@@ -3982,7 +4009,7 @@
     }
   },
   "viewSendHiddenEmailWarning": {
-    "message": "創建此 Send 的 Bitwarden 使用者已選擇隱藏他們的電子郵件位址。在使用或下載此連結的內容之前，應確保您信任此連結的來源。",
+    "message": "建立此 Send 的 Bitwarden 使用者已選擇隱藏他們的電子郵件位址。在使用或下載此連結的內容之前，應確保您信任此連結的來源。",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "expirationDateIsInvalid": {
@@ -4079,7 +4106,7 @@
     "message": "重設密碼"
   },
   "resetPasswordLoggedOutWarning": {
-    "message": "接下來會將 $NAME$ 登出目前的會話，並要求他們重新登入。其他裝置上的活動會話最多會保持一個小時。",
+    "message": "接下來會將 $NAME$ 登出目前的工作階段，並要求他們重新登入帳戶。其他裝置上的活動工作階段最多會保持一個小時。",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -4202,7 +4229,7 @@
     "message": "提供商設定"
   },
   "setupProviderLoginDesc": {
-    "message": "您被邀請設定一個新的提供商。要繼續，您需要登入或創建一個新的 Bitwarden 帳戶。"
+    "message": "您被邀請設定一個新的提供者。若想繼續，您需要登入或建立一個新的 Bitwarden 帳戶。"
   },
   "setupProviderDesc": {
     "message": "請在下面輸入詳細資訊以完成提供商設定。如果您有任何問題，請聯絡客戶支援。"
@@ -4229,13 +4256,13 @@
     "message": "服務使用者可以存取和管理所有客戶組織。"
   },
   "providerInviteUserDesc": {
-    "message": "通過在下面輸入他們的 Bitwarden 帳戶電子郵件位址，來邀請新的使用者加入您的提供商。如果他們還沒有 Bitwarden 帳戶，將提示他們創建新帳戶。"
+    "message": "透過在下方輸入他們的 Bitwarden 帳戶電子郵件位址，來邀請新的使用者加入您的提供者。如果他們還沒有 Bitwarden 帳戶，將提示他們建立新帳戶。"
   },
   "joinProvider": {
     "message": "加入提供商"
   },
   "joinProviderDesc": {
-    "message": "您已被邀請加入上面列出的提供商。要接受邀請，您需要登入或創建新的 Bitwarden 帳戶。"
+    "message": "您已被邀請加入上面列出的提供者。若想接受邀請，您需要登入或建立新的 Bitwarden 帳戶。"
   },
   "providerInviteAcceptFailed": {
     "message": "無法接受邀請。請要求提供商管理員發送一個新的邀請。"
@@ -4253,7 +4280,7 @@
     "message": "新建客戶組織"
   },
   "newClientOrganizationDesc": {
-    "message": "創建一個新的客戶組織，該組織將作為提供商與您關聯。您將能够存取和管理此組織。"
+    "message": "建立一個新的客戶組織，該組織將作為提供者與您關聯。您將能夠存取和管理此組織。"
   },
   "addExistingOrganization": {
     "message": "添加現有的組織"
@@ -4323,10 +4350,10 @@
     "message": "更新主密碼"
   },
   "updateMasterPasswordWarning": {
-    "message": "您的主密碼最近被您的組織管理者變更過。您必須現在更新主密碼才能存取密碼庫。繼續操作會登出您目前的會話，並要求您重新登入。其他裝置上的活動會話可能會持續長達一個小時。"
+    "message": "您的主密碼最近被您的組織管理者變更過。您必須現在更新主密碼才能存取密碼庫。繼續操作會登出您目前的工作階段，並要求您重新登入帳戶。其他裝置上的活動工作階段最多會保持一個小時。"
   },
   "masterPasswordInvalidWarning": {
-    "message": "您的主密碼不符合此組織原則的要求。您必須現在更新主密碼才可以才加入此組織。繼續操作會登出您目前的會話，並要求您重新登入。其他裝置上的活動會話可能會持續長達一個小時。"
+    "message": "您的主密碼不符合此組織原則的要求。您必須現在更新主密碼才可以才加入此組織。繼續操作會登出您目前的工作階段，並要求您重新登入帳戶。其他裝置上的活動工作階段最多會保持一個小時。"
   },
   "maximumVaultTimeout": {
     "message": "密碼庫逾時時長"
@@ -4417,22 +4444,22 @@
     "message": "從使用者資訊端點獲取聲明"
   },
   "additionalScopes": {
-    "message": "附加/自訂範圍（逗號分隔）"
+    "message": "自訂範圍"
   },
   "additionalUserIdClaimTypes": {
-    "message": "附加/自訂使用者 ID 聲明類型（逗號分隔）"
+    "message": "自訂使用者 ID 聲明類型"
   },
   "additionalEmailClaimTypes": {
-    "message": "附加/自訂電子郵件聲明類型（逗號分隔）"
+    "message": "電子郵件聲明類型"
   },
   "additionalNameClaimTypes": {
-    "message": "附加/自訂名稱聲明類型（逗號分隔）"
+    "message": "自訂名稱聲明類型"
   },
   "acrValues": {
-    "message": "請求的認證上下文類引用值（acr_value）"
+    "message": "請求的認證上下文類引用值"
   },
   "expectedReturnAcrValue": {
-    "message": "回應中預期的「acr」索賠值（acr 驗證）"
+    "message": "回應中預期的「acr」聲明值"
   },
   "spEntityId": {
     "message": "SP 實體 ID"
@@ -4459,7 +4486,7 @@
     "message": "希望宣告被簽名"
   },
   "spValidateCertificates": {
-    "message": "驗證證書"
+    "message": "驗證憑證"
   },
   "idpEntityId": {
     "message": "實體 ID"
@@ -4474,7 +4501,7 @@
     "message": "單一登出服務 URL"
   },
   "idpX509PublicCert": {
-    "message": "X509 公共證書"
+    "message": "X509 公開憑證"
   },
   "idpOutboundSigningAlgorithm": {
     "message": "傳出的簽名演算法"
@@ -4483,10 +4510,10 @@
     "message": "允許未經請求的認證回應"
   },
   "idpAllowOutboundLogoutRequests": {
-    "message": "Allow outbound logout requests"
+    "message": "允許出站註銷請求"
   },
   "idpSignAuthenticationRequests": {
-    "message": "Sign authentication requests"
+    "message": "簽名身份驗證請求"
   },
   "ssoSettingsSaved": {
     "message": "單一登入配置已儲存。"
@@ -4531,7 +4558,7 @@
     "message": "如果您離開或被從該組織中移除，您的家庭方案將在計費周期結束時逾期。"
   },
   "acceptBitwardenFamiliesHelp": {
-    "message": "接受現有組織的邀請或創建一個新的家庭組織。"
+    "message": "接受現有組織的邀請或建立一個新的家庭組織。"
   },
   "setupSponsoredFamiliesLoginDesc": {
     "message": "您被邀請加入一個免費的 Bitwarden 家庭方案組織。若要繼續，您需要登入到接受邀請的帳戶。"
@@ -4594,7 +4621,7 @@
     "message": "移除贊助後，您將自己負責此訂閱和相關的賬單。您確定要繼續嗎？"
   },
   "sponsorshipCreated": {
-    "message": "贊助已創建"
+    "message": "贊助已建立"
   },
   "revoke": {
     "message": "撤銷"
@@ -4711,7 +4738,7 @@
     "message": "請提供一個與此組織關聯的付款方式。別擔心，我們不會向您收取任何費用，除非您選擇進階功能或您的贊助到期。 "
   },
   "orgCreatedSponsorshipInvalid": {
-    "message": "贊助邀請已逾期，您可以删除您創建的組織，以避免在 7 天試用期結束時收取費用。 您也可以關閉此提示以保留該組織並承擔計費責任。"
+    "message": "贊助邀請已逾期，您可以上傳您建立的組織，以避免在 7 天試用期結束時被收取費用。 您也可以關閉此提示以保留該組織並承擔計費責任。"
   },
   "newFamiliesOrganization": {
     "message": "新的家庭組織"
@@ -4738,7 +4765,7 @@
     "message": "免費贊助"
   },
   "formErrorSummaryPlural": {
-    "message": "$COUNT$ fields above need your attention.",
+    "message": "上面的 $COUNT$ 個欄位需要您注意。",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -4747,10 +4774,10 @@
     }
   },
   "formErrorSummarySingle": {
-    "message": "1 field above needs your attention."
+    "message": "上面的 1 個欄位需要您注意。"
   },
   "fieldRequiredError": {
-    "message": "$FIELDNAME$ is required.",
+    "message": "$FIELDNAME$ 必填。",
     "placeholders": {
       "fieldname": {
         "content": "$1",
@@ -4759,19 +4786,19 @@
     }
   },
   "required": {
-    "message": "required"
+    "message": "必填"
   },
   "idpSingleSignOnServiceUrlRequired": {
-    "message": "Required if Entity ID is not a URL."
+    "message": "如果 Entity ID 非 URL，則必填。"
   },
   "openIdOptionalCustomizations": {
-    "message": "Optional Customizations"
+    "message": "選用定制"
   },
   "openIdAuthorityRequired": {
-    "message": "Required if Authority is not valid."
+    "message": "如果授權不可用，則必填。"
   },
   "separateMultipleWithComma": {
-    "message": "Separate multiple with a comma."
+    "message": "使用逗號分隔。"
   },
   "sessionTimeout": {
     "message": "您的登入階段已逾時，請返回並嘗試重新登入。"
diff --git a/webpack.config.js b/webpack.config.js
index 98edecfb..a1ae0394 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -205,7 +205,7 @@ const devServer =
               {
                 key: "Content-Security-Policy",
                 value:
-                  "default-src 'self'; script-src 'self' 'sha256-ryoU+5+IUZTuUyTElqkrQGBJXr1brEv6r2CA62WUw8w=' https://js.stripe.com https://js.braintreegateway.com https://www.paypalobjects.com; style-src 'self' https://assets.braintreegateway.com https://*.paypal.com 'sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=' 'sha256-JVRXyYPueLWdwGwY9m/7u4QlZ1xeQdqUj2t8OVIzZE4='; img-src 'self' data: https://icons.bitwarden.net https://*.paypal.com https://www.paypalobjects.com https://q.stripe.com https://haveibeenpwned.com https://www.gravatar.com; child-src 'self' https://js.stripe.com https://assets.braintreegateway.com https://*.paypal.com https://*.duosecurity.com; frame-src 'self' https://js.stripe.com https://assets.braintreegateway.com https://*.paypal.com https://*.duosecurity.com; connect-src 'self' wss://notifications.bitwarden.com https://notifications.bitwarden.com https://cdn.bitwarden.net https://api.pwnedpasswords.com https://2fa.directory/api/v3/totp.json https://api.stripe.com https://www.paypal.com https://api.braintreegateway.com https://client-analytics.braintreegateway.com https://*.braintree-api.com https://bitwardenxx5keu3w.blob.core.windows.net; object-src 'self' blob:;",
+                  "default-src 'self'; script-src 'self' 'sha256-ryoU+5+IUZTuUyTElqkrQGBJXr1brEv6r2CA62WUw8w=' https://js.stripe.com https://js.braintreegateway.com https://www.paypalobjects.com; style-src 'self' https://assets.braintreegateway.com https://*.paypal.com 'sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=' 'sha256-JVRXyYPueLWdwGwY9m/7u4QlZ1xeQdqUj2t8OVIzZE4='; img-src 'self' data: https://icons.bitwarden.net https://*.paypal.com https://www.paypalobjects.com https://q.stripe.com https://haveibeenpwned.com https://www.gravatar.com; child-src 'self' https://js.stripe.com https://assets.braintreegateway.com https://*.paypal.com https://*.duosecurity.com; frame-src 'self' https://js.stripe.com https://assets.braintreegateway.com https://*.paypal.com https://*.duosecurity.com; connect-src 'self' wss://notifications.bitwarden.com https://notifications.bitwarden.com https://cdn.bitwarden.net https://api.pwnedpasswords.com https://2fa.directory/api/v3/totp.json https://api.stripe.com https://www.paypal.com https://api.braintreegateway.com https://client-analytics.braintreegateway.com https://*.braintree-api.com https://*.blob.core.windows.net; object-src 'self' blob:;",
               },
             ];
           }