Merge branch 'feature/org-admin-refresh' into EC-8-restructure-tabs

apps/web/.eslintrc.json

@@ -1,5 +1,13 @@
 {
   "env": {
     "browser": true
+  },
+  "rules": {
+    "no-restricted-imports": [
+      "error",
+      {
+        "patterns": ["**/core/*"]
+      }
+    ]
   }
 }

apps/web/src/abstractions/state.service.ts

@@ -1,9 +0,0 @@
-import { StateService as BaseStateService } from "@bitwarden/common/abstractions/state.service";
-import { StorageOptions } from "@bitwarden/common/models/domain/storageOptions";
-
-import { Account } from "src/models/account";
-
-export abstract class StateService extends BaseStateService<Account> {
-  getRememberEmail: (options?: StorageOptions) => Promise<boolean>;
-  setRememberEmail: (value: boolean, options?: StorageOptions) => Promise<void>;
-}

apps/web/src/app/accounts/lock.component.ts

@@ -13,7 +13,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout.service";
 
-import { RouterService } from "../services/router.service";
+import { RouterService } from "../core";
 
 @Component({
   selector: "app-lock",

apps/web/src/app/accounts/login.component.ts

@@ -19,8 +19,7 @@ import { Policy } from "@bitwarden/common/models/domain/policy";
 import { ListResponse } from "@bitwarden/common/models/response/listResponse";
 import { PolicyResponse } from "@bitwarden/common/models/response/policyResponse";
 
-import { StateService } from "../../abstractions/state.service";
-import { RouterService } from "../services/router.service";
+import { RouterService, StateService } from "../core";
 
 @Component({
   selector: "app-login",

apps/web/src/app/accounts/register.component.ts

@@ -1,5 +1,5 @@
 import { Component } from "@angular/core";
-import { FormBuilder } from "@angular/forms";
+import { UntypedFormBuilder } from "@angular/forms";
 import { ActivatedRoute, Router } from "@angular/router";
 import { first } from "rxjs/operators";
 
@@ -20,7 +20,7 @@ import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/mas
 import { Policy } from "@bitwarden/common/models/domain/policy";
 import { ReferenceEventRequest } from "@bitwarden/common/models/request/referenceEventRequest";
 
-import { RouterService } from "../services/router.service";
+import { RouterService } from "../core";
 
 @Component({
   selector: "app-register",
@@ -36,7 +36,7 @@ export class RegisterComponent extends BaseRegisterComponent {
 
   constructor(
     formValidationErrorService: FormValidationErrorsService,
-    formBuilder: FormBuilder,
+    formBuilder: UntypedFormBuilder,
     authService: AuthService,
     router: Router,
     i18nService: I18nService,

apps/web/src/app/accounts/two-factor.component.ts

@@ -14,7 +14,7 @@ import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service";
 import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType";
 
-import { RouterService } from "../services/router.service";
+import { RouterService } from "../core";
 
 import { TwoFactorOptionsComponent } from "./two-factor-options.component";
 

apps/web/src/app/app.component.ts

@@ -26,6 +26,7 @@ import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { SyncService } from "@bitwarden/common/abstractions/sync.service";
 import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout.service";
 
+import { PolicyListService, RouterService } from "./core";
 import { DisableSendPolicy } from "./organizations/policies/disable-send.component";
 import { MasterPasswordPolicy } from "./organizations/policies/master-password.component";
 import { PasswordGeneratorPolicy } from "./organizations/policies/password-generator.component";
@@ -35,8 +36,6 @@ import { ResetPasswordPolicy } from "./organizations/policies/reset-password.com
 import { SendOptionsPolicy } from "./organizations/policies/send-options.component";
 import { SingleOrgPolicy } from "./organizations/policies/single-org.component";
 import { TwoFactorAuthenticationPolicy } from "./organizations/policies/two-factor-authentication.component";
-import { PolicyListService } from "./services/policy-list.service";
-import { RouterService } from "./services/router.service";
 
 const BroadcasterSubscriptionId = "AppComponent";
 const IdleTimeout = 60000 * 10; // 10 minutes

apps/web/src/app/app.module.ts

@@ -6,9 +6,9 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 import { InfiniteScrollModule } from "ngx-infinite-scroll";
 
 import { AppComponent } from "./app.component";
+import { CoreModule } from "./core";
 import { OssRoutingModule } from "./oss-routing.module";
 import { OssModule } from "./oss.module";
-import { ServicesModule } from "./services/services.module";
 import { WildcardRoutingModule } from "./wildcard-routing.module";
 
 @NgModule({
@@ -16,7 +16,7 @@ import { WildcardRoutingModule } from "./wildcard-routing.module";
     OssModule,
     BrowserAnimationsModule,
     FormsModule,
-    ServicesModule,
+    CoreModule,
     InfiniteScrollModule,
     DragDropModule,
     LayoutModule,

apps/web/src/app/common/base.events.component.ts

@@ -9,7 +9,7 @@ import { EventResponse } from "@bitwarden/common/models/response/eventResponse";
 import { ListResponse } from "@bitwarden/common/models/response/listResponse";
 import { EventView } from "@bitwarden/common/models/view/eventView";
 
-import { EventService } from "src/app/services/event.service";
+import { EventService } from "src/app/core";
 
 @Directive()
 export abstract class BaseEventsComponent {

apps/web/src/app/common/base.people.component.ts

@@ -55,9 +55,9 @@ export abstract class BasePeopleComponent<
       : 0;
   }
 
-  get deactivatedCount() {
-    return this.statusMap.has(this.userStatusType.Deactivated)
-      ? this.statusMap.get(this.userStatusType.Deactivated).length
+  get revokedCount() {
+    return this.statusMap.has(this.userStatusType.Revoked)
+      ? this.statusMap.get(this.userStatusType.Revoked).length
       : 0;
   }
 
@@ -112,8 +112,8 @@ export abstract class BasePeopleComponent<
   abstract edit(user: UserType): void;
   abstract getUsers(): Promise<ListResponse<UserType>>;
   abstract deleteUser(id: string): Promise<any>;
-  abstract deactivateUser(id: string): Promise<any>;
-  abstract activateUser(id: string): Promise<any>;
+  abstract revokeUser(id: string): Promise<any>;
+  abstract restoreUser(id: string): Promise<any>;
   abstract reinviteUser(id: string): Promise<any>;
   abstract confirmUser(user: UserType, publicKey: Uint8Array): Promise<any>;
 
@@ -133,7 +133,7 @@ export abstract class BasePeopleComponent<
       } else {
         this.statusMap.get(u.status).push(u);
       }
-      if (u.status !== this.userStatusType.Deactivated) {
+      if (u.status !== this.userStatusType.Revoked) {
         this.activeUsers.push(u);
       }
     });
@@ -235,9 +235,9 @@ export abstract class BasePeopleComponent<
     this.actionPromise = null;
   }
 
-  async deactivate(user: UserType) {
+  async revoke(user: UserType) {
     const confirmed = await this.platformUtilsService.showDialog(
-      this.deactivateWarningMessage(),
+      this.revokeWarningMessage(),
       this.i18nService.t("revokeUserId", this.userNamePipe.transform(user)),
       this.i18nService.t("revokeAccess"),
       this.i18nService.t("cancel"),
@@ -248,7 +248,7 @@ export abstract class BasePeopleComponent<
       return false;
     }
 
-    this.actionPromise = this.deactivateUser(user.id);
+    this.actionPromise = this.revokeUser(user.id);
     try {
       await this.actionPromise;
       this.platformUtilsService.showToast(
@@ -263,8 +263,8 @@ export abstract class BasePeopleComponent<
     this.actionPromise = null;
   }
 
-  async activate(user: UserType) {
-    this.actionPromise = this.activateUser(user.id);
+  async restore(user: UserType) {
+    this.actionPromise = this.restoreUser(user.id);
     try {
       await this.actionPromise;
       this.platformUtilsService.showToast(
@@ -381,18 +381,10 @@ export abstract class BasePeopleComponent<
     return !searching && this.users && this.users.length > this.pageSize;
   }
 
-  protected deleteWarningMessage(user: UserType): string {
-    return this.i18nService.t("removeUserConfirmation");
-  }
-
-  protected deactivateWarningMessage(): string {
+  protected revokeWarningMessage(): string {
     return this.i18nService.t("revokeUserConfirmation");
   }
 
-  protected activateWarningMessage(): string {
-    return this.i18nService.t("activateUserConfirmation");
-  }
-
   protected getCheckedUsers() {
     return this.users.filter((u) => (u as any).checked);
   }

apps/web/src/app/core/core.module.ts

@@ -1,5 +1,5 @@
-import { APP_INITIALIZER, NgModule } from "@angular/core";
-import { ToastrModule } from "ngx-toastr";
+import { CommonModule } from "@angular/common";
+import { APP_INITIALIZER, NgModule, Optional, SkipSelf } from "@angular/core";
 
 import {
   JslibServicesModule,
@@ -13,7 +13,6 @@ import {
 import { ModalService as ModalServiceAbstraction } from "@bitwarden/angular/services/modal.service";
 import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service";
 import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/abstractions/messaging.service";
 import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/abstractions/passwordReprompt.service";
 import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/abstractions/platformUtils.service";
@@ -23,33 +22,24 @@ import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.s
 import { StateFactory } from "@bitwarden/common/factories/stateFactory";
 import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service";
 
-import { StateService as StateServiceAbstraction } from "../../abstractions/state.service";
-import { Account } from "../../models/account";
-import { GlobalState } from "../../models/globalState";
-import { BroadcasterMessagingService } from "../../services/broadcasterMessaging.service";
-import { HtmlStorageService } from "../../services/htmlStorage.service";
-import { I18nService } from "../../services/i18n.service";
-import { PasswordRepromptService } from "../../services/passwordReprompt.service";
-import { StateService } from "../../services/state.service";
-import { StateMigrationService } from "../../services/stateMigration.service";
-import { WebPlatformUtilsService } from "../../services/webPlatformUtils.service";
-import { HomeGuard } from "../guards/home.guard";
-import { PermissionsGuard as OrgPermissionsGuard } from "../organizations/guards/permissions.guard";
-import { NavigationPermissionsService as OrgPermissionsService } from "../organizations/services/navigation-permissions.service";
-
+import { BroadcasterMessagingService } from "./broadcaster-messaging.service";
 import { EventService } from "./event.service";
+import { HtmlStorageService } from "./html-storage.service";
+import { I18nService } from "./i18n.service";
 import { InitService } from "./init.service";
 import { ModalService } from "./modal.service";
+import { PasswordRepromptService } from "./password-reprompt.service";
 import { PolicyListService } from "./policy-list.service";
 import { RouterService } from "./router.service";
-import { WebFileDownloadService } from "./webFileDownload.service";
+import { Account, GlobalState, StateService } from "./state";
+import { StateMigrationService } from "./state-migration.service";
+import { WebFileDownloadService } from "./web-file-download.service";
+import { WebPlatformUtilsService } from "./web-platform-utils.service";
 
 @NgModule({
-  imports: [ToastrModule, JslibServicesModule],
   declarations: [],
+  imports: [CommonModule, JslibServicesModule],
   providers: [
-    OrgPermissionsService,
-    OrgPermissionsGuard,
     InitService,
     RouterService,
     EventService,
@@ -95,22 +85,10 @@ import { WebFileDownloadService } from "./webFileDownload.service";
       useClass: StateMigrationService,
       deps: [AbstractStorageService, SECURE_STORAGE, STATE_FACTORY],
     },
-    {
-      provide: StateServiceAbstraction,
-      useClass: StateService,
-      deps: [
-        AbstractStorageService,
-        SECURE_STORAGE,
-        MEMORY_STORAGE,
-        LogService,
-        StateMigrationServiceAbstraction,
-        STATE_FACTORY,
-        STATE_SERVICE_USE_CACHE,
-      ],
-    },
+    StateService,
     {
       provide: BaseStateServiceAbstraction,
-      useExisting: StateServiceAbstraction,
+      useExisting: StateService,
     },
     {
       provide: PasswordRepromptServiceAbstraction,
@@ -120,7 +98,12 @@ import { WebFileDownloadService } from "./webFileDownload.service";
       provide: FileDownloadService,
       useClass: WebFileDownloadService,
     },
-    HomeGuard,
   ],
 })
-export class ServicesModule {}
+export class CoreModule {
+  constructor(@Optional() @SkipSelf() parentModule?: CoreModule) {
+    if (parentModule) {
+      throw new Error("CoreModule is already loaded. Import it in the AppModule only");
+    }
+  }
+}

apps/web/src/app/core/event.service.ts

@@ -280,14 +280,14 @@ export class EventService {
           this.getShortId(ev.organizationUserId)
         );
         break;
-      case EventType.OrganizationUser_Deactivated:
+      case EventType.OrganizationUser_Revoked:
         msg = this.i18nService.t("revokedUserId", this.formatOrgUserId(ev));
         humanReadableMsg = this.i18nService.t(
           "revokedUserId",
           this.getShortId(ev.organizationUserId)
         );
         break;
-      case EventType.OrganizationUser_Activated:
+      case EventType.OrganizationUser_Restored:
         msg = this.i18nService.t("restoredUserId", this.formatOrgUserId(ev));
         humanReadableMsg = this.i18nService.t(
           "restoredUserId",
@@ -301,11 +301,9 @@ export class EventService {
       case EventType.Organization_PurgedVault:
         msg = humanReadableMsg = this.i18nService.t("purgedOrganizationVault");
         break;
-      /*
-            case EventType.Organization_ClientExportedVault:
-                msg = this.i18nService.t('exportedOrganizationVault');
-                break;
-            */
+      case EventType.Organization_ClientExportedVault:
+        msg = humanReadableMsg = this.i18nService.t("exportedOrganizationVault");
+        break;
       case EventType.Organization_VaultAccessed:
         msg = humanReadableMsg = this.i18nService.t("vaultAccessedByProvider");
         break;

apps/web/src/app/core/index.ts

@@ -0,0 +1,5 @@
+export * from "./core.module";
+export * from "./event.service";
+export * from "./policy-list.service";
+export * from "./router.service";
+export * from "./state/state.service";

apps/web/src/app/core/init.service.ts

@@ -17,7 +17,7 @@ import { ContainerService } from "@bitwarden/common/services/container.service";
 import { EventService as EventLoggingService } from "@bitwarden/common/services/event.service";
 import { VaultTimeoutService as VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout.service";
 
-import { I18nService as I18nService } from "../../services/i18n.service";
+import { I18nService } from "./i18n.service";
 
 @Injectable()
 export class InitService {
@@ -52,7 +52,7 @@ export class InitService {
       htmlEl.classList.add("locale_" + this.i18nService.translationLocale);
       await this.themingService.monitorThemeChanges();
       const containerService = new ContainerService(this.cryptoService);
-      containerService.attachToWindow(this.win);
+      containerService.attachToGlobal(this.win);
     };
   }
 }

apps/web/src/app/core/password-reprompt.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from "@angular/core";
 
 import { PasswordRepromptService as BasePasswordRepromptService } from "@bitwarden/angular/services/passwordReprompt.service";
 
-import { PasswordRepromptComponent } from "../app/components/password-reprompt.component";
+import { PasswordRepromptComponent } from "../components/password-reprompt.component";
 
 @Injectable()
 export class PasswordRepromptService extends BasePasswordRepromptService {

apps/web/src/app/core/state-migration.service.ts

@@ -1,7 +1,7 @@
 import { StateMigrationService as BaseStateMigrationService } from "@bitwarden/common/services/stateMigration.service";
 
-import { Account } from "../models/account";
-import { GlobalState } from "../models/globalState";
+import { Account } from "./state/account";
+import { GlobalState } from "./state/global-state";
 
 export class StateMigrationService extends BaseStateMigrationService<GlobalState, Account> {
   protected async migrationStateFrom1To2(): Promise<void> {

apps/web/src/app/core/state/index.ts

@@ -0,0 +1,3 @@
+export * from "./account";
+export * from "./global-state";
+export * from "./state.service";

apps/web/src/app/core/state/state.service.ts

@@ -1,3 +1,15 @@
+import { Inject, Injectable } from "@angular/core";
+
+import {
+  MEMORY_STORAGE,
+  SECURE_STORAGE,
+  STATE_FACTORY,
+  STATE_SERVICE_USE_CACHE,
+} from "@bitwarden/angular/services/jslib-services.module";
+import { LogService } from "@bitwarden/common/abstractions/log.service";
+import { StateMigrationService } from "@bitwarden/common/abstractions/stateMigration.service";
+import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.service";
+import { StateFactory } from "@bitwarden/common/factories/stateFactory";
 import { CipherData } from "@bitwarden/common/models/data/cipherData";
 import { CollectionData } from "@bitwarden/common/models/data/collectionData";
 import { FolderData } from "@bitwarden/common/models/data/folderData";
@@ -5,16 +17,33 @@ import { SendData } from "@bitwarden/common/models/data/sendData";
 import { StorageOptions } from "@bitwarden/common/models/domain/storageOptions";
 import { StateService as BaseStateService } from "@bitwarden/common/services/state.service";
 
-import { StateService as StateServiceAbstraction } from "../abstractions/state.service";
-import { Account } from "../models/account";
-import { GlobalState } from "../models/globalState";
+import { Account } from "./account";
+import { GlobalState } from "./global-state";
+
+@Injectable()
+export class StateService extends BaseStateService<GlobalState, Account> {
+  constructor(
+    storageService: AbstractStorageService,
+    @Inject(SECURE_STORAGE) secureStorageService: AbstractStorageService,
+    @Inject(MEMORY_STORAGE) memoryStorageService: AbstractStorageService,
+    logService: LogService,
+    stateMigrationService: StateMigrationService,
+    @Inject(STATE_FACTORY) stateFactory: StateFactory<GlobalState, Account>,
+    @Inject(STATE_SERVICE_USE_CACHE) useAccountCache = true
+  ) {
+    super(
+      storageService,
+      secureStorageService,
+      memoryStorageService,
+      logService,
+      stateMigrationService,
+      stateFactory,
+      useAccountCache
+    );
+  }
 
-export class StateService
-  extends BaseStateService<GlobalState, Account>
-  implements StateServiceAbstraction
-{
   async addAccount(account: Account) {
-    // Apply web overides to default account values
+    // Apply web overrides to default account values
     account = new Account(account);
     await super.addAccount(account);
   }

apps/web/src/app/guards/home.guard.ts

@@ -4,7 +4,9 @@ import { ActivatedRouteSnapshot, CanActivate, Router } from "@angular/router";
 import { AuthService } from "@bitwarden/common/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus";
 
-@Injectable()
+@Injectable({
+  providedIn: "root",
+})
 export class HomeGuard implements CanActivate {
   constructor(private router: Router, private authService: AuthService) {}
 

apps/web/src/app/modules/loose-components.module.ts

@@ -27,17 +27,17 @@ import { FooterComponent } from "../layouts/footer.component";
 import { FrontendLayoutComponent } from "../layouts/frontend-layout.component";
 import { NavbarComponent } from "../layouts/navbar.component";
 import { UserLayoutComponent } from "../layouts/user-layout.component";
-import { GroupAddEditComponent as OrgGroupAddEditComponent } from "../organizations/groups/group-add-edit.component";
-import { GroupsComponent as OrgGroupsComponent } from "../organizations/groups/groups.component";
 import { OrganizationLayoutComponent } from "../organizations/layouts/organization-layout.component";
 import { BulkConfirmComponent as OrgBulkConfirmComponent } from "../organizations/manage/bulk/bulk-confirm.component";
-import { BulkDeactivateComponent as OrgBulkDeactivateomponent } from "../organizations/manage/bulk/bulk-deactivate.component";
 import { BulkRemoveComponent as OrgBulkRemoveComponent } from "../organizations/manage/bulk/bulk-remove.component";
+import { BulkRestoreRevokeComponent as OrgBulkRestoreRevokeComponent } from "../organizations/manage/bulk/bulk-restore-revoke.component";
 import { BulkStatusComponent as OrgBulkStatusComponent } from "../organizations/manage/bulk/bulk-status.component";
 import { CollectionAddEditComponent as OrgCollectionAddEditComponent } from "../organizations/manage/collection-add-edit.component";
 import { CollectionsComponent as OrgManageCollectionsComponent } from "../organizations/manage/collections.component";
 import { EntityEventsComponent as OrgEntityEventsComponent } from "../organizations/manage/entity-events.component";
 import { EventsComponent as OrgEventsComponent } from "../organizations/manage/events.component";
+import { GroupAddEditComponent as OrgGroupAddEditComponent } from "../organizations/manage/group-add-edit.component";
+import { GroupsComponent as OrgGroupsComponent } from "../organizations/manage/groups.component";
 import { ManageComponent as OrgManageComponent } from "../organizations/manage/manage.component";
 import { PeopleComponent as OrgPeopleComponent } from "../organizations/manage/people.component";
 import { PoliciesComponent as OrgPoliciesComponent } from "../organizations/manage/policies.component";
@@ -231,7 +231,7 @@ import { OrganizationBadgeModule } from "./vault/modules/organization-badge/orga
     OrganizationPlansComponent,
     OrgAttachmentsComponent,
     OrgBulkConfirmComponent,
-    OrgBulkDeactivateomponent,
+    OrgBulkRestoreRevokeComponent,
     OrgBulkRemoveComponent,
     OrgBulkStatusComponent,
     OrgCiphersComponent,
@@ -382,7 +382,7 @@ import { OrganizationBadgeModule } from "./vault/modules/organization-badge/orga
     OrganizationPlansComponent,
     OrgAttachmentsComponent,
     OrgBulkConfirmComponent,
-    OrgBulkDeactivateomponent,
+    OrgBulkRestoreRevokeComponent,
     OrgBulkRemoveComponent,
     OrgBulkStatusComponent,
     OrgCiphersComponent,

apps/web/src/app/modules/organizations/create/organization-information.component.ts

@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, Output } from "@angular/core";
-import { FormGroup } from "@angular/forms";
+import { UntypedFormGroup } from "@angular/forms";
 
 @Component({
   selector: "app-org-info",
@@ -10,6 +10,6 @@ export class OrganizationInformationComponent {
   @Input() createOrganization = true;
   @Input() isProvider = false;
   @Input() acceptingSponsorship = false;
-  @Input() formGroup: FormGroup;
+  @Input() formGroup: UntypedFormGroup;
   @Output() changedBusinessOwned = new EventEmitter<void>();
 }

apps/web/src/app/modules/register-form/register-form.component.html

@@ -9,7 +9,7 @@
     <div class="tw-mb-3">
       <bit-form-field>
         <bit-label>{{ "emailAddress" | i18n }}</bit-label>
-        <input bitInput type="email" formControlName="email" />
+        <input id="register-form_input_email" bitInput type="email" formControlName="email" />
         <bit-hint>{{ "emailAddressDesc" | i18n }}</bit-hint>
       </bit-form-field>
     </div>
@@ -17,7 +17,7 @@
     <div class="tw-mb-3">
       <bit-form-field>
         <bit-label>{{ "name" | i18n }}</bit-label>
-        <input bitInput type="text" formControlName="name" />
+        <input id="register-form_input_name" bitInput type="text" formControlName="name" />
         <bit-hint>{{ "yourNameDesc" | i18n }}</bit-hint>
       </bit-form-field>
     </div>
@@ -32,6 +32,7 @@
       <bit-form-field>
         <bit-label>{{ "masterPass" | i18n }}</bit-label>
         <input
+          id="register-form_input_master-password"
           bitInput
           (input)="updatePasswordStrength()"
           type="{{ showPassword ? 'text' : 'password' }}"
@@ -57,6 +58,7 @@
       <bit-form-field>
         <bit-label>{{ "reTypeMasterPass" | i18n }}</bit-label>
         <input
+          id="register-form_input_confirm-master-password"
           bitInput
           type="{{ showPassword ? 'text' : 'password' }}"
           formControlName="confirmMasterPassword"
@@ -74,7 +76,7 @@
     <div class="tw-mb-3">
       <bit-form-field>
         <bit-label>{{ "masterPassHint" | i18n }}</bit-label>
-        <input bitInput type="text" formControlName="hint" />
+        <input id="register-form_input_hint" bitInput type="text" formControlName="hint" />
         <bit-hint>{{ "masterPassHintDesc" | i18n }}</bit-hint>
       </bit-form-field>
     </div>
@@ -86,6 +88,7 @@
     <div class="tw-flex tw-items-start tw-mb-3" *ngIf="showTerms">
       <div class="tw-flex tw-items-center tw-h-6">
         <input
+          id="register-form_input_accept-policies"
           class="tw-w-4 tw-rounded tw-border tw-border-gray-300"
           bitInput
           type="checkbox"

apps/web/src/app/modules/register-form/register-form.component.ts

@@ -1,5 +1,5 @@
 import { Component, Input } from "@angular/core";
-import { FormBuilder } from "@angular/forms";
+import { UntypedFormBuilder } from "@angular/forms";
 import { Router } from "@angular/router";
 
 import { RegisterComponent as BaseRegisterComponent } from "@bitwarden/angular/components/register.component";
@@ -28,7 +28,7 @@ export class RegisterFormComponent extends BaseRegisterComponent {
 
   constructor(
     formValidationErrorService: FormValidationErrorsService,
-    formBuilder: FormBuilder,
+    formBuilder: UntypedFormBuilder,
     authService: AuthService,
     router: Router,
     i18nService: I18nService,

apps/web/src/app/modules/trial-initiation/billing.component.ts

@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, Output } from "@angular/core";
-import { FormBuilder, FormGroup } from "@angular/forms";
+import { UntypedFormBuilder, FormGroup } from "@angular/forms";
 import { Router } from "@angular/router";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
@@ -11,6 +11,7 @@ import { OrganizationService } from "@bitwarden/common/abstractions/organization
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { PolicyService } from "@bitwarden/common/abstractions/policy.service";
 import { SyncService } from "@bitwarden/common/abstractions/sync.service";
+import { ProductType } from "@bitwarden/common/enums/productType";
 
 import { OrganizationPlansComponent } from "src/app/settings/organization-plans.component";
 
@@ -33,7 +34,7 @@ export class BillingComponent extends OrganizationPlansComponent {
     organizationService: OrganizationService,
     logService: LogService,
     messagingService: MessagingService,
-    formBuilder: FormBuilder
+    formBuilder: UntypedFormBuilder
   ) {
     super(
       apiService,
@@ -51,10 +52,11 @@ export class BillingComponent extends OrganizationPlansComponent {
   }
 
   async ngOnInit() {
+    const additionalSeats = this.product == ProductType.Families ? 0 : 1;
     this.formGroup.patchValue({
       name: this.orgInfoForm.get("name")?.value,
       billingEmail: this.orgInfoForm.get("email")?.value,
-      additionalSeats: 1,
+      additionalSeats: additionalSeats,
       plan: this.plan,
       product: this.product,
     });

apps/web/src/app/modules/trial-initiation/trial-initiation.component.ts

@@ -1,7 +1,7 @@
 import { StepperSelectionEvent } from "@angular/cdk/stepper";
 import { TitleCasePipe } from "@angular/common";
 import { Component, OnInit, ViewChild } from "@angular/core";
-import { FormBuilder, Validators } from "@angular/forms";
+import { UntypedFormBuilder, Validators } from "@angular/forms";
 import { ActivatedRoute, Router } from "@angular/router";
 import { first } from "rxjs";
 
@@ -34,6 +34,7 @@ export class TrialInitiationComponent implements OnInit {
   accountCreateOnly = true;
   policies: Policy[];
   enforcedPolicyOptions: MasterPasswordPolicyOptions;
+  validOrgs: string[] = ["teams", "enterprise", "families"];
   @ViewChild("stepper", { static: false }) verticalStepper: VerticalStepperComponent;
 
   orgInfoFormGroup = this.formBuilder.group({
@@ -44,7 +45,7 @@ export class TrialInitiationComponent implements OnInit {
   constructor(
     private route: ActivatedRoute,
     protected router: Router,
-    private formBuilder: FormBuilder,
+    private formBuilder: UntypedFormBuilder,
     private titleCasePipe: TitleCasePipe,
     private stateService: StateService,
     private apiService: ApiService,
@@ -63,17 +64,22 @@ export class TrialInitiationComponent implements OnInit {
         return;
       }
 
-      this.org = qParams.org;
+      if (this.validOrgs.includes(qParams.org)) {
+        this.org = qParams.org;
+      } else {
+        this.org = "families";
+      }
+
       this.orgLabel = this.titleCasePipe.transform(this.org);
       this.accountCreateOnly = false;
 
-      if (qParams.org === "families") {
+      if (this.org === "families") {
         this.plan = PlanType.FamiliesAnnually;
         this.product = ProductType.Families;
-      } else if (qParams.org === "teams") {
+      } else if (this.org === "teams") {
         this.plan = PlanType.TeamsAnnually;
         this.product = ProductType.Teams;
-      } else if (qParams.org === "enterprise") {
+      } else if (this.org === "enterprise") {
         this.plan = PlanType.EnterpriseAnnually;
         this.product = ProductType.Enterprise;
       }

apps/web/src/app/modules/vault-filter/components/organization-filter.component.html

@@ -129,21 +129,21 @@
             <button class="filter-button" (click)="applyOrganizationFilter(organization)">
               <i class="bwi bwi-fw bwi-business" aria-hidden="true"></i>
               {{ organization.name }}
+            </button>
+            <span class="ml-auto">
               <i
                 *ngIf="!organization.enabled"
-                class="bwi bwi-fw bwi-exclamation-triangle text-danger"
+                class="org-options bwi bwi-fw bwi-exclamation-triangle text-danger"
                 aria-label="{{ 'organizationIsDisabled' | i18n }}"
                 appA11yTitle="{{ 'organizationIsDisabled' | i18n }}"
-              ></i>
-            </button>
-            <ng-container>
-              <button [bitMenuTriggerFor]="orgMenu" class="org-options ml-auto">
+              ></i
+              ><button [bitMenuTriggerFor]="orgMenu" class="org-options">
                 <i class="bwi bwi-ellipsis-v" aria-hidden="true"></i>
               </button>
               <bit-menu class="filter-organization-options" #orgMenu>
                 <app-organization-options [organization]="organization"></app-organization-options>
               </bit-menu>
-            </ng-container>
+            </span>
           </span>
         </li>
         <li class="filter-option" *ngIf="!(displayMode === 'singleOrganizationPolicy')">

apps/web/src/app/modules/vault-filter/components/organization-options.component.html

@@ -13,7 +13,7 @@
 >
   <button
     *ngIf="allowEnrollmentChanges(organization) && !organization.resetPasswordEnrolled"
-    class="dropdown-item"
+    class="!tw-text-main active:!tw-ring-0 active:!tw-ring-offset-0 focus:tw-bg-secondary-100 focus:tw-outline-none focus:tw-ring focus:tw-ring-offset-2 focus:tw-ring-primary-700 focus:tw-z-50 hover:tw-bg-secondary-100 tw-bg-background tw-block tw-border-none tw-cursor-pointer tw-px-4 tw-py-2 tw-text-left"
     (click)="toggleResetPasswordEnrollment(organization)"
   >
     <i class="bwi bwi-fw bwi-key" aria-hidden="true"></i>
@@ -21,7 +21,7 @@
   </button>
   <button
     *ngIf="allowEnrollmentChanges(organization) && organization.resetPasswordEnrolled"
-    class="dropdown-item"
+    class="!tw-text-main active:!tw-ring-0 active:!tw-ring-offset-0 focus:tw-bg-secondary-100 focus:tw-outline-none focus:tw-ring focus:tw-ring-offset-2 focus:tw-ring-primary-700 focus:tw-z-50 hover:tw-bg-secondary-100 tw-bg-background tw-block tw-border-none tw-cursor-pointer tw-px-4 tw-py-2 tw-text-left"
     (click)="toggleResetPasswordEnrollment(organization)"
   >
     <i class="bwi bwi-fw bwi-undo" aria-hidden="true"></i>
@@ -30,7 +30,7 @@
   <ng-container *ngIf="organization.useSso && organization.identifier">
     <button
       *ngIf="organization.ssoBound; else linkSso"
-      class="dropdown-item"
+      class="!tw-text-main active:!tw-ring-0 active:!tw-ring-offset-0 focus:tw-bg-secondary-100 focus:tw-outline-none focus:tw-ring focus:tw-ring-offset-2 focus:tw-ring-primary-700 focus:tw-z-50 hover:tw-bg-secondary-100 tw-bg-background tw-block tw-border-none tw-cursor-pointer tw-px-4 tw-py-2 tw-text-left"
       (click)="unlinkSso(organization)"
     >
       <i class="bwi bwi-fw bwi-chain-broken" aria-hidden="true"></i>
@@ -40,7 +40,10 @@
       <app-link-sso [organization]="organization"> </app-link-sso>
     </ng-template>
   </ng-container>
-  <button class="dropdown-item text-danger" (click)="leave(organization)">
+  <button
+    class="text-danger active:!tw-ring-0 active:!tw-ring-offset-0 focus:tw-bg-secondary-100 focus:tw-outline-none focus:tw-ring focus:tw-ring-offset-2 focus:tw-ring-primary-700 focus:tw-z-50 hover:tw-bg-secondary-100 tw-bg-background tw-block tw-border-none tw-cursor-pointer tw-px-4 tw-py-2 tw-text-left"
+    (click)="leave(organization)"
+  >
     <i class="bwi bwi-fw bwi-sign-out" aria-hidden="true"></i>
     {{ "leave" | i18n }}
   </button>

apps/web/src/app/organizations/groups/groups.component.html

@@ -1,79 +0,0 @@
-<div class="container page-content">
-  <div class="page-header d-flex">
-    <h1>{{ "groups" | i18n }}</h1>
-    <div class="ml-auto d-flex">
-      <div>
-        <label class="sr-only" for="search">{{ "search" | i18n }}</label>
-        <input
-          type="search"
-          class="form-control form-control-sm"
-          id="search"
-          placeholder="{{ 'search' | i18n }}"
-          [(ngModel)]="searchText"
-        />
-      </div>
-      <button type="button" class="btn btn-sm btn-outline-primary ml-3" (click)="add()">
-        <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
-        {{ "newGroup" | i18n }}
-      </button>
-    </div>
-  </div>
-  <ng-container *ngIf="loading">
-    <i
-      class="bwi bwi-spinner bwi-spin text-muted"
-      title="{{ 'loading' | i18n }}"
-      aria-hidden="true"
-    ></i>
-    <span class="sr-only">{{ "loading" | i18n }}</span>
-  </ng-container>
-  <ng-container
-    *ngIf="
-      !loading &&
-      (isPaging() ? pagedGroups : (groups | search: searchText:'name':'id')) as searchedGroups
-    "
-  >
-    <p *ngIf="!searchedGroups.length">{{ "noGroupsInList" | i18n }}</p>
-    <table
-      class="table table-hover table-list"
-      *ngIf="searchedGroups.length"
-      infiniteScroll
-      [infiniteScrollDistance]="1"
-      [infiniteScrollDisabled]="!isPaging()"
-      (scrolled)="loadMore()"
-    >
-      <tbody>
-        <tr *ngFor="let g of searchedGroups">
-          <td>
-            <a href="#" appStopClick (click)="edit(g)">{{ g.name }}</a>
-          </td>
-          <td class="table-list-options">
-            <div class="dropdown" appListDropdown>
-              <button
-                class="btn btn-outline-secondary dropdown-toggle"
-                type="button"
-                data-toggle="dropdown"
-                aria-haspopup="true"
-                aria-expanded="false"
-                appA11yTitle="{{ 'options' | i18n }}"
-              >
-                <i class="bwi bwi-cog bwi-lg" aria-hidden="true"></i>
-              </button>
-              <div class="dropdown-menu dropdown-menu-right">
-                <a class="dropdown-item" href="#" appStopClick (click)="users(g)">
-                  <i class="bwi bwi-fw bwi-users" aria-hidden="true"></i>
-                  {{ "users" | i18n }}
-                </a>
-                <a class="dropdown-item text-danger" href="#" appStopClick (click)="delete(g)">
-                  <i class="bwi bwi-fw bwi-trash" aria-hidden="true"></i>
-                  {{ "delete" | i18n }}
-                </a>
-              </div>
-            </div>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </ng-container>
-  <ng-template #addEdit></ng-template>
-  <ng-template #usersTemplate></ng-template>
-</div>

apps/web/src/app/organizations/guards/permissions.guard.ts

@@ -7,7 +7,9 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti
 import { SyncService } from "@bitwarden/common/abstractions/sync.service";
 import { Permissions } from "@bitwarden/common/enums/permissions";
 
-@Injectable()
+@Injectable({
+  providedIn: "root",
+})
 export class PermissionsGuard implements CanActivate {
   constructor(
     private router: Router,

apps/web/src/app/organizations/manage/bulk/bulk-restore-revoke.component.html

@@ -22,7 +22,7 @@
           {{ error }}
         </app-callout>
         <ng-container *ngIf="!done">
-          <app-callout type="warning" *ngIf="users.length > 0 && !error && isDeactivating">
+          <app-callout type="warning" *ngIf="users.length > 0 && !error && isRevoking">
             {{ "revokeUsersWarning" | i18n }}
           </app-callout>
           <table class="table table-hover table-list">

apps/web/src/app/organizations/manage/bulk/bulk-restore-revoke.component.ts

@@ -8,11 +8,11 @@ import { OrganizationUserBulkRequest } from "@bitwarden/common/models/request/or
 import { BulkUserDetails } from "./bulk-status.component";
 
 @Component({
-  selector: "app-bulk-deactivate",
-  templateUrl: "bulk-deactivate.component.html",
+  selector: "app-bulk-restore-revoke",
+  templateUrl: "bulk-restore-revoke.component.html",
 })
-export class BulkDeactivateComponent {
-  isDeactivating: boolean;
+export class BulkRestoreRevokeComponent {
+  isRevoking: boolean;
   organizationId: string;
   users: BulkUserDetails[];
 
@@ -27,13 +27,13 @@ export class BulkDeactivateComponent {
     protected i18nService: I18nService,
     config: ModalConfig
   ) {
-    this.isDeactivating = config.data.isDeactivating;
+    this.isRevoking = config.data.isRevoking;
     this.organizationId = config.data.organizationId;
     this.users = config.data.users;
   }
 
   get bulkTitle() {
-    const titleKey = this.isDeactivating ? "revokeUsers" : "restoreUsers";
+    const titleKey = this.isRevoking ? "revokeUsers" : "restoreUsers";
     return this.i18nService.t(titleKey);
   }
 
@@ -42,7 +42,7 @@ export class BulkDeactivateComponent {
     try {
       const response = await this.performBulkUserAction();
 
-      const bulkMessage = this.isDeactivating ? "bulkRevokedMessage" : "bulkRestoredMessage";
+      const bulkMessage = this.isRevoking ? "bulkRevokedMessage" : "bulkRestoredMessage";
       response.data.forEach((entry) => {
         const error = entry.error !== "" ? entry.error : this.i18nService.t(bulkMessage);
         this.statuses.set(entry.id, error);
@@ -57,10 +57,10 @@ export class BulkDeactivateComponent {
 
   protected async performBulkUserAction() {
     const request = new OrganizationUserBulkRequest(this.users.map((user) => user.id));
-    if (this.isDeactivating) {
-      return await this.apiService.deactivateManyOrganizationUsers(this.organizationId, request);
+    if (this.isRevoking) {
+      return await this.apiService.revokeManyOrganizationUsers(this.organizationId, request);
     } else {
-      return await this.apiService.activateManyOrganizationUsers(this.organizationId, request);
+      return await this.apiService.restoreManyOrganizationUsers(this.organizationId, request);
     }
   }
 }

apps/web/src/app/organizations/manage/entity-events.component.ts

@@ -8,7 +8,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti
 import { EventResponse } from "@bitwarden/common/models/response/eventResponse";
 import { ListResponse } from "@bitwarden/common/models/response/listResponse";
 
-import { EventService } from "../../services/event.service";
+import { EventService } from "../../core";
 
 @Component({
   selector: "app-entity-events",

apps/web/src/app/organizations/manage/events.component.ts

@@ -14,7 +14,7 @@ import { Organization } from "@bitwarden/common/models/domain/organization";
 import { EventResponse } from "@bitwarden/common/models/response/eventResponse";
 
 import { BaseEventsComponent } from "../../common/base.events.component";
-import { EventService } from "../../services/event.service";
+import { EventService } from "../../core";
 
 @Component({
   selector: "app-org-events",

apps/web/src/app/organizations/manage/groups.component.html

@@ -0,0 +1,77 @@
+<div class="page-header d-flex">
+  <h1>{{ "groups" | i18n }}</h1>
+  <div class="ml-auto d-flex">
+    <div>
+      <label class="sr-only" for="search">{{ "search" | i18n }}</label>
+      <input
+        type="search"
+        class="form-control form-control-sm"
+        id="search"
+        placeholder="{{ 'search' | i18n }}"
+        [(ngModel)]="searchText"
+      />
+    </div>
+    <button type="button" class="btn btn-sm btn-outline-primary ml-3" (click)="add()">
+      <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
+      {{ "newGroup" | i18n }}
+    </button>
+  </div>
+</div>
+<ng-container *ngIf="loading">
+  <i
+    class="bwi bwi-spinner bwi-spin text-muted"
+    title="{{ 'loading' | i18n }}"
+    aria-hidden="true"
+  ></i>
+  <span class="sr-only">{{ "loading" | i18n }}</span>
+</ng-container>
+<ng-container
+  *ngIf="
+    !loading &&
+    (isPaging() ? pagedGroups : (groups | search: searchText:'name':'id')) as searchedGroups
+  "
+>
+  <p *ngIf="!searchedGroups.length">{{ "noGroupsInList" | i18n }}</p>
+  <table
+    class="table table-hover table-list"
+    *ngIf="searchedGroups.length"
+    infiniteScroll
+    [infiniteScrollDistance]="1"
+    [infiniteScrollDisabled]="!isPaging()"
+    (scrolled)="loadMore()"
+  >
+    <tbody>
+      <tr *ngFor="let g of searchedGroups">
+        <td>
+          <a href="#" appStopClick (click)="edit(g)">{{ g.name }}</a>
+        </td>
+        <td class="table-list-options">
+          <div class="dropdown" appListDropdown>
+            <button
+              class="btn btn-outline-secondary dropdown-toggle"
+              type="button"
+              data-toggle="dropdown"
+              aria-haspopup="true"
+              aria-expanded="false"
+              appA11yTitle="{{ 'options' | i18n }}"
+            >
+              <i class="bwi bwi-cog bwi-lg" aria-hidden="true"></i>
+            </button>
+            <div class="dropdown-menu dropdown-menu-right">
+              <a class="dropdown-item" href="#" appStopClick (click)="users(g)">
+                <i class="bwi bwi-fw bwi-users" aria-hidden="true"></i>
+                {{ "users" | i18n }}
+              </a>
+              <a class="dropdown-item text-danger" href="#" appStopClick (click)="delete(g)">
+                <i class="bwi bwi-fw bwi-trash" aria-hidden="true"></i>
+                {{ "delete" | i18n }}
+              </a>
+            </div>
+          </div>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</ng-container>
+<ng-template #addEdit></ng-template>
+<ng-template #usersTemplate></ng-template>

apps/web/src/app/organizations/manage/groups.component.ts

@@ -49,7 +49,7 @@ export class GroupsComponent implements OnInit {
   ) {}
 
   async ngOnInit() {
-    this.route.parent.params.subscribe(async (params) => {
+    this.route.parent.parent.params.subscribe(async (params) => {
       this.organizationId = params.organizationId;
       const organization = await this.organizationService.get(this.organizationId);
       if (organization == null || !organization.useGroups) {

apps/web/src/app/organizations/manage/people.component.html

@@ -32,11 +32,11 @@
       <button
         type="button"
         class="btn btn-outline-secondary"
-        [ngClass]="{ active: status == userStatusType.Deactivated }"
-        (click)="filter(userStatusType.Deactivated)"
+        [ngClass]="{ active: status == userStatusType.Revoked }"
+        (click)="filter(userStatusType.Revoked)"
       >
-        {{ "deactivated" | i18n }}
-        <span bitBadge badgeType="info" *ngIf="deactivatedCount">{{ deactivatedCount }}</span>
+        {{ "revoked" | i18n }}
+        <span bitBadge badgeType="info" *ngIf="revokedCount">{{ revokedCount }}</span>
       </button>
     </div>
     <div class="ml-3">
@@ -75,13 +75,13 @@
           <i class="bwi bwi-fw bwi-check" aria-hidden="true"></i>
           {{ "confirmSelected" | i18n }}
         </button>
-        <button class="dropdown-item" appStopClick (click)="bulkActivate()">
+        <button class="dropdown-item" appStopClick (click)="bulkRestore()">
           <i class="bwi bwi-fw bwi-plus-circle" aria-hidden="true"></i>
-          {{ "activate" | i18n }}
+          {{ "restoreAccess" | i18n }}
         </button>
-        <button class="dropdown-item" appStopClick (click)="bulkDeactivate()">
+        <button class="dropdown-item" appStopClick (click)="bulkRevoke()">
           <i class="bwi bwi-fw bwi-minus-circle" aria-hidden="true"></i>
-          {{ "deactivate" | i18n }}
+          {{ "revokeAccess" | i18n }}
         </button>
         <button class="dropdown-item text-danger" appStopClick (click)="bulkRemove()">
           <i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>
@@ -158,8 +158,8 @@
             <span bitBadge badgeType="warning" *ngIf="u.status === userStatusType.Accepted">{{
               "accepted" | i18n
             }}</span>
-            <span bitBadge badgeType="secondary" *ngIf="u.status === userStatusType.Deactivated">{{
-              "deactivated" | i18n
+            <span bitBadge badgeType="secondary" *ngIf="u.status === userStatusType.Revoked">{{
+              "revoked" | i18n
             }}</span>
             <small class="text-muted d-block" *ngIf="u.name">{{ u.name }}</small>
           </td>
@@ -255,21 +255,21 @@
                   class="dropdown-item"
                   href="#"
                   appStopClick
-                  (click)="activate(u)"
-                  *ngIf="u.status === userStatusType.Deactivated"
+                  (click)="restore(u)"
+                  *ngIf="u.status === userStatusType.Revoked"
                 >
                   <i class="bwi bwi-fw bwi-plus-circle" aria-hidden="true"></i>
-                  {{ "activate" | i18n }}
+                  {{ "restoreAccess" | i18n }}
                 </a>
                 <a
                   class="dropdown-item"
                   href="#"
                   appStopClick
-                  (click)="deactivate(u)"
-                  *ngIf="u.status !== userStatusType.Deactivated"
+                  (click)="revoke(u)"
+                  *ngIf="u.status !== userStatusType.Revoked"
                 >
                   <i class="bwi bwi-fw bwi-minus-circle" aria-hidden="true"></i>
-                  {{ "deactivate" | i18n }}
+                  {{ "revokeAccess" | i18n }}
                 </a>
                 <a class="dropdown-item text-danger" href="#" appStopClick (click)="remove(u)">
                   <i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>

apps/web/src/app/organizations/manage/people.component.ts

@@ -29,8 +29,8 @@ import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/models/re
 import { BasePeopleComponent } from "../../common/base.people.component";
 
 import { BulkConfirmComponent } from "./bulk/bulk-confirm.component";
-import { BulkDeactivateComponent } from "./bulk/bulk-deactivate.component";
 import { BulkRemoveComponent } from "./bulk/bulk-remove.component";
+import { BulkRestoreRevokeComponent } from "./bulk/bulk-restore-revoke.component";
 import { BulkStatusComponent } from "./bulk/bulk-status.component";
 import { EntityEventsComponent } from "./entity-events.component";
 import { ResetPasswordComponent } from "./reset-password.component";
@@ -167,12 +167,12 @@ export class PeopleComponent
     return this.apiService.deleteOrganizationUser(this.organizationId, id);
   }
 
-  deactivateUser(id: string): Promise<any> {
-    return this.apiService.deactivateOrganizationUser(this.organizationId, id);
+  revokeUser(id: string): Promise<any> {
+    return this.apiService.revokeOrganizationUser(this.organizationId, id);
   }
 
-  activateUser(id: string): Promise<any> {
-    return this.apiService.activateOrganizationUser(this.organizationId, id);
+  restoreUser(id: string): Promise<any> {
+    return this.apiService.restoreOrganizationUser(this.organizationId, id);
   }
 
   reinviteUser(id: string): Promise<any> {
@@ -245,11 +245,11 @@ export class PeopleComponent
           modal.close();
           this.removeUser(user);
         });
-        comp.onDeactivatedUser.subscribe(() => {
+        comp.onRevokedUser.subscribe(() => {
           modal.close();
           this.load();
         });
-        comp.onActivatedUser.subscribe(() => {
+        comp.onRestoredUser.subscribe(() => {
           modal.close();
           this.load();
         });
@@ -290,25 +290,25 @@ export class PeopleComponent
     await this.load();
   }
 
-  async bulkDeactivate() {
-    await this.bulkActivateOrDeactivate(true);
+  async bulkRevoke() {
+    await this.bulkRevokeOrRestore(true);
   }
 
-  async bulkActivate() {
-    await this.bulkActivateOrDeactivate(false);
+  async bulkRestore() {
+    await this.bulkRevokeOrRestore(false);
   }
 
-  async bulkActivateOrDeactivate(isDeactivating: boolean) {
+  async bulkRevokeOrRestore(isRevoking: boolean) {
     if (this.actionPromise != null) {
       return;
     }
 
-    const ref = this.modalService.open(BulkDeactivateComponent, {
+    const ref = this.modalService.open(BulkRestoreRevokeComponent, {
       allowMultipleModals: true,
       data: {
         organizationId: this.organizationId,
         users: this.getCheckedUsers(),
-        isDeactivating: isDeactivating,
+        isRevoking: isRevoking,
       },
     });
 

apps/web/src/app/organizations/manage/policies.component.ts

@@ -9,7 +9,7 @@ import { PolicyType } from "@bitwarden/common/enums/policyType";
 import { Organization } from "@bitwarden/common/models/domain/organization";
 import { PolicyResponse } from "@bitwarden/common/models/response/policyResponse";
 
-import { PolicyListService } from "../../services/policy-list.service";
+import { PolicyListService } from "../../core";
 import { BasePolicy } from "../policies/base-policy.component";
 
 import { PolicyEditComponent } from "./policy-edit.component";

apps/web/src/app/organizations/manage/user-add-edit.component.html

@@ -11,7 +11,7 @@
         <h2 class="modal-title" id="userAddEditTitle">
           {{ title }}
           <small class="text-muted" *ngIf="name">{{ name }}</small>
-          <span bitBadge badgeType="secondary" *ngIf="isDeactivated">{{ "revoked" | i18n }}</span>
+          <span bitBadge badgeType="secondary" *ngIf="isRevoked">{{ "revoked" | i18n }}</span>
         </h2>
         <button
           type="button"
@@ -381,9 +381,9 @@
         <div class="ml-auto">
           <button
             type="button"
-            (click)="activate()"
+            (click)="restore()"
             class="btn btn-outline-secondary"
-            *ngIf="editMode && isDeactivated"
+            *ngIf="editMode && isRevoked"
             [disabled]="form.loading"
           >
             <i
@@ -396,9 +396,9 @@
           </button>
           <button
             type="button"
-            (click)="deactivate()"
+            (click)="revoke()"
             class="btn btn-outline-secondary"
-            *ngIf="editMode && !isDeactivated"
+            *ngIf="editMode && !isRevoked"
             [disabled]="form.loading"
           >
             <i

apps/web/src/app/organizations/manage/user-add-edit.component.ts

@@ -27,12 +27,12 @@ export class UserAddEditComponent implements OnInit {
   @Input() usesKeyConnector = false;
   @Output() onSavedUser = new EventEmitter();
   @Output() onDeletedUser = new EventEmitter();
-  @Output() onDeactivatedUser = new EventEmitter();
-  @Output() onActivatedUser = new EventEmitter();
+  @Output() onRevokedUser = new EventEmitter();
+  @Output() onRestoredUser = new EventEmitter();
 
   loading = true;
   editMode = false;
-  isDeactivated = false;
+  isRevoked = false;
   title: string;
   emails: string;
   type: OrganizationUserType = OrganizationUserType.User;
@@ -101,7 +101,7 @@ export class UserAddEditComponent implements OnInit {
         );
         this.access = user.accessAll ? "all" : "selected";
         this.type = user.type;
-        this.isDeactivated = user.status === OrganizationUserStatusType.Deactivated;
+        this.isRevoked = user.status === OrganizationUserStatusType.Revoked;
         if (user.type === OrganizationUserType.Custom) {
           this.permissions = user.permissions;
         }
@@ -245,7 +245,7 @@ export class UserAddEditComponent implements OnInit {
     }
   }
 
-  async deactivate() {
+  async revoke() {
     if (!this.editMode) {
       return;
     }
@@ -262,7 +262,7 @@ export class UserAddEditComponent implements OnInit {
     }
 
     try {
-      this.formPromise = this.apiService.deactivateOrganizationUser(
+      this.formPromise = this.apiService.revokeOrganizationUser(
         this.organizationId,
         this.organizationUserId
       );
@@ -272,20 +272,20 @@ export class UserAddEditComponent implements OnInit {
         null,
         this.i18nService.t("revokedUserId", this.name)
       );
-      this.isDeactivated = true;
-      this.onDeactivatedUser.emit();
+      this.isRevoked = true;
+      this.onRevokedUser.emit();
     } catch (e) {
       this.logService.error(e);
     }
   }
 
-  async activate() {
+  async restore() {
     if (!this.editMode) {
       return;
     }
 
     try {
-      this.formPromise = this.apiService.activateOrganizationUser(
+      this.formPromise = this.apiService.restoreOrganizationUser(
         this.organizationId,
         this.organizationUserId
       );
@@ -295,8 +295,8 @@ export class UserAddEditComponent implements OnInit {
         null,
         this.i18nService.t("restoredUserId", this.name)
       );
-      this.isDeactivated = false;
-      this.onActivatedUser.emit();
+      this.isRevoked = false;
+      this.onRestoredUser.emit();
     } catch (e) {
       this.logService.error(e);
     }

apps/web/src/app/organizations/members/members.component.html

@@ -1,298 +0,0 @@
-<div class="container page-content">
-  <div class="page-header d-flex">
-    <h1>{{ "members" | i18n }}</h1>
-    <div class="mt-2 d-flex ml-auto">
-      <div class="btn-group btn-group-sm" role="group">
-        <button
-          type="button"
-          class="btn btn-outline-secondary"
-          [ngClass]="{ active: status == null }"
-          (click)="filter(null)"
-        >
-          {{ "all" | i18n }}
-          <span bitBadge badgeType="info" *ngIf="allCount">{{ allCount }}</span>
-        </button>
-        <button
-          type="button"
-          class="btn btn-outline-secondary"
-          [ngClass]="{ active: status == userStatusType.Invited }"
-          (click)="filter(userStatusType.Invited)"
-        >
-          {{ "invited" | i18n }}
-          <span bitBadge badgeType="info" *ngIf="invitedCount">{{ invitedCount }}</span>
-        </button>
-        <button
-          type="button"
-          class="btn btn-outline-secondary"
-          [ngClass]="{ active: status == userStatusType.Accepted }"
-          (click)="filter(userStatusType.Accepted)"
-        >
-          {{ "accepted" | i18n }}
-          <span bitBadge badgeType="warning" *ngIf="acceptedCount">{{ acceptedCount }}</span>
-        </button>
-        <button
-          type="button"
-          class="btn btn-outline-secondary"
-          [ngClass]="{ active: status == userStatusType.Deactivated }"
-          (click)="filter(userStatusType.Deactivated)"
-        >
-          {{ "revoked" | i18n }}
-          <span bitBadge badgeType="info" *ngIf="deactivatedCount">{{ deactivatedCount }}</span>
-        </button>
-      </div>
-      <div class="ml-3">
-        <label class="sr-only" for="search">{{ "search" | i18n }}</label>
-        <input
-          type="search"
-          class="form-control form-control-sm"
-          id="search"
-          placeholder="{{ 'search' | i18n }}"
-          [(ngModel)]="searchText"
-        />
-      </div>
-      <div class="dropdown ml-3" appListDropdown>
-        <button
-          class="btn btn-sm btn-outline-secondary dropdown-toggle"
-          type="button"
-          id="bulkActionsButton"
-          data-toggle="dropdown"
-          aria-haspopup="true"
-          aria-expanded="false"
-          appA11yTitle="{{ 'options' | i18n }}"
-        >
-          <i class="bwi bwi-cog" aria-hidden="true"></i>
-        </button>
-        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="bulkActionsButton">
-          <button class="dropdown-item" appStopClick (click)="bulkReinvite()">
-            <i class="bwi bwi-fw bwi-envelope" aria-hidden="true"></i>
-            {{ "reinviteSelected" | i18n }}
-          </button>
-          <button
-            class="dropdown-item text-success"
-            appStopClick
-            (click)="bulkConfirm()"
-            *ngIf="showBulkConfirmUsers"
-          >
-            <i class="bwi bwi-fw bwi-check" aria-hidden="true"></i>
-            {{ "confirmSelected" | i18n }}
-          </button>
-          <button class="dropdown-item" appStopClick (click)="bulkActivate()">
-            <i class="bwi bwi-fw bwi-plus-circle" aria-hidden="true"></i>
-            {{ "restoreAccess" | i18n }}
-          </button>
-          <button class="dropdown-item" appStopClick (click)="bulkDeactivate()">
-            <i class="bwi bwi-fw bwi-minus-circle" aria-hidden="true"></i>
-            {{ "revokeAccess" | i18n }}
-          </button>
-          <button class="dropdown-item text-danger" appStopClick (click)="bulkRemove()">
-            <i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>
-            {{ "remove" | i18n }}
-          </button>
-          <div class="dropdown-divider"></div>
-          <button class="dropdown-item" appStopClick (click)="selectAll(true)">
-            <i class="bwi bwi-fw bwi-check-square" aria-hidden="true"></i>
-            {{ "selectAll" | i18n }}
-          </button>
-          <button class="dropdown-item" appStopClick (click)="selectAll(false)">
-            <i class="bwi bwi-fw bwi-minus-square" aria-hidden="true"></i>
-            {{ "unselectAll" | i18n }}
-          </button>
-        </div>
-      </div>
-      <button type="button" class="btn btn-sm btn-outline-primary ml-3" (click)="invite()">
-        <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
-        {{ "inviteUser" | i18n }}
-      </button>
-    </div>
-  </div>
-  <ng-container *ngIf="loading">
-    <i
-      class="bwi bwi-spinner bwi-spin text-muted"
-      title="{{ 'loading' | i18n }}"
-      aria-hidden="true"
-    ></i>
-    <span class="sr-only">{{ "loading" | i18n }}</span>
-  </ng-container>
-  <ng-container
-    *ngIf="
-      !loading &&
-      (isPaging() ? pagedUsers : (users | search: searchText:'name':'email':'id')) as searchedUsers
-    "
-  >
-    <p *ngIf="!searchedUsers.length">{{ "noUsersInList" | i18n }}</p>
-    <ng-container *ngIf="searchedUsers.length">
-      <app-callout
-        type="info"
-        title="{{ 'confirmUsers' | i18n }}"
-        icon="bwi bwi-check-circle"
-        *ngIf="showConfirmUsers"
-      >
-        {{ "usersNeedConfirmed" | i18n }}
-      </app-callout>
-      <table
-        class="table table-hover table-list"
-        infiniteScroll
-        [infiniteScrollDistance]="1"
-        [infiniteScrollDisabled]="!isPaging()"
-        (scrolled)="loadMore()"
-      >
-        <tbody>
-          <tr *ngFor="let u of searchedUsers">
-            <td (click)="checkUser(u)" class="table-list-checkbox">
-              <input type="checkbox" [(ngModel)]="u.checked" appStopProp />
-            </td>
-            <td width="30">
-              <app-avatar
-                [data]="u | userName"
-                [email]="u.email"
-                size="25"
-                [circle]="true"
-                [fontSize]="14"
-              >
-              </app-avatar>
-            </td>
-            <td>
-              <a href="#" appStopClick (click)="edit(u)">{{ u.email }}</a>
-              <span bitBadge badgeType="secondary" *ngIf="u.status === userStatusType.Invited">{{
-                "invited" | i18n
-              }}</span>
-              <span bitBadge badgeType="warning" *ngIf="u.status === userStatusType.Accepted">{{
-                "accepted" | i18n
-              }}</span>
-              <span
-                bitBadge
-                badgeType="secondary"
-                *ngIf="u.status === userStatusType.Deactivated"
-                >{{ "revoked" | i18n }}</span
-              >
-              <small class="text-muted d-block" *ngIf="u.name">{{ u.name }}</small>
-            </td>
-            <td>
-              <ng-container *ngIf="u.twoFactorEnabled">
-                <i
-                  class="bwi bwi-lock"
-                  title="{{ 'userUsingTwoStep' | i18n }}"
-                  aria-hidden="true"
-                ></i>
-                <span class="sr-only">{{ "userUsingTwoStep" | i18n }}</span>
-              </ng-container>
-              <ng-container *ngIf="showEnrolledStatus(u)">
-                <i
-                  class="bwi bwi-key"
-                  title="{{ 'enrolledPasswordReset' | i18n }}"
-                  aria-hidden="true"
-                ></i>
-                <span class="sr-only">{{ "enrolledPasswordReset" | i18n }}</span>
-              </ng-container>
-            </td>
-            <td>
-              <span *ngIf="u.type === userType.Owner">{{ "owner" | i18n }}</span>
-              <span *ngIf="u.type === userType.Admin">{{ "admin" | i18n }}</span>
-              <span *ngIf="u.type === userType.Manager">{{ "manager" | i18n }}</span>
-              <span *ngIf="u.type === userType.User">{{ "user" | i18n }}</span>
-              <span *ngIf="u.type === userType.Custom">{{ "custom" | i18n }}</span>
-            </td>
-            <td class="table-list-options">
-              <div class="dropdown" appListDropdown>
-                <button
-                  class="btn btn-outline-secondary dropdown-toggle"
-                  type="button"
-                  data-toggle="dropdown"
-                  aria-haspopup="true"
-                  aria-expanded="false"
-                  appA11yTitle="{{ 'options' | i18n }}"
-                >
-                  <i class="bwi bwi-cog bwi-lg" aria-hidden="true"></i>
-                </button>
-                <div class="dropdown-menu dropdown-menu-right">
-                  <a
-                    class="dropdown-item"
-                    href="#"
-                    appStopClick
-                    (click)="reinvite(u)"
-                    *ngIf="u.status === userStatusType.Invited"
-                  >
-                    <i class="bwi bwi-fw bwi-envelope" aria-hidden="true"></i>
-                    {{ "resendInvitation" | i18n }}
-                  </a>
-                  <a
-                    class="dropdown-item text-success"
-                    href="#"
-                    appStopClick
-                    (click)="confirm(u)"
-                    *ngIf="u.status === userStatusType.Accepted"
-                  >
-                    <i class="bwi bwi-fw bwi-check" aria-hidden="true"></i>
-                    {{ "confirm" | i18n }}
-                  </a>
-                  <a
-                    class="dropdown-item"
-                    href="#"
-                    appStopClick
-                    (click)="groups(u)"
-                    *ngIf="accessGroups"
-                  >
-                    <i class="bwi bwi-fw bwi-sitemap" aria-hidden="true"></i>
-                    {{ "groups" | i18n }}
-                  </a>
-                  <a
-                    class="dropdown-item"
-                    href="#"
-                    appStopClick
-                    (click)="events(u)"
-                    *ngIf="accessEvents && u.status === userStatusType.Confirmed"
-                  >
-                    <i class="bwi bwi-fw bwi-file-text" aria-hidden="true"></i>
-                    {{ "eventLogs" | i18n }}
-                  </a>
-                  <a
-                    class="dropdown-item"
-                    href="#"
-                    appStopClick
-                    (click)="resetPassword(u)"
-                    *ngIf="allowResetPassword(u)"
-                  >
-                    <i class="bwi bwi-fw bwi-key" aria-hidden="true"></i>
-                    {{ "resetPassword" | i18n }}
-                  </a>
-                  <a
-                    class="dropdown-item"
-                    href="#"
-                    appStopClick
-                    (click)="activate(u)"
-                    *ngIf="u.status === userStatusType.Deactivated"
-                  >
-                    <i class="bwi bwi-fw bwi-plus-circle" aria-hidden="true"></i>
-                    {{ "restoreAccess" | i18n }}
-                  </a>
-                  <a
-                    class="dropdown-item"
-                    href="#"
-                    appStopClick
-                    (click)="deactivate(u)"
-                    *ngIf="u.status !== userStatusType.Deactivated"
-                  >
-                    <i class="bwi bwi-fw bwi-minus-circle" aria-hidden="true"></i>
-                    {{ "revokeAccess" | i18n }}
-                  </a>
-                  <a class="dropdown-item text-danger" href="#" appStopClick (click)="remove(u)">
-                    <i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>
-                    {{ "remove" | i18n }}
-                  </a>
-                </div>
-              </div>
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </ng-container>
-  </ng-container>
-  <ng-template #addEdit></ng-template>
-  <ng-template #groupsTemplate></ng-template>
-  <ng-template #eventsTemplate></ng-template>
-  <ng-template #confirmTemplate></ng-template>
-  <ng-template #resetPasswordTemplate></ng-template>
-  <ng-template #bulkStatusTemplate></ng-template>
-  <ng-template #bulkConfirmTemplate></ng-template>
-  <ng-template #bulkRemoveTemplate></ng-template>
-</div>

apps/web/src/app/organizations/organization-routing.module.ts

@@ -12,10 +12,10 @@ import { ReportListComponent } from "../modules/organizations/reporting/report-l
 import { ReportingComponent } from "../modules/organizations/reporting/reporting.component";
 import { OrganizationVaultModule } from "../modules/vault/modules/organization-vault/organization-vault.module";
 
-import { GroupsComponent } from "./groups/groups.component";
 import { PermissionsGuard } from "./guards/permissions.guard";
 import { OrganizationLayoutComponent } from "./layouts/organization-layout.component";
 import { EventsComponent } from "./manage/events.component";
+import { GroupsComponent } from "./manage/groups.component";
 import { PeopleComponent } from "./manage/people.component";
 import { NavigationPermissionsService } from "./services/navigation-permissions.service";
 import { AccountComponent } from "./settings/account.component";

apps/web/src/app/organizations/policies/base-policy.component.ts

@@ -1,5 +1,5 @@
 import { Directive, Input, OnInit } from "@angular/core";
-import { FormControl, FormGroup } from "@angular/forms";
+import { UntypedFormControl, UntypedFormGroup } from "@angular/forms";
 
 import { PolicyType } from "@bitwarden/common/enums/policyType";
 import { Organization } from "@bitwarden/common/models/domain/organization";
@@ -22,8 +22,8 @@ export abstract class BasePolicyComponent implements OnInit {
   @Input() policyResponse: PolicyResponse;
   @Input() policy: BasePolicy;
 
-  enabled = new FormControl(false);
-  data: FormGroup = null;
+  enabled = new UntypedFormControl(false);
+  data: UntypedFormGroup = null;
 
   ngOnInit(): void {
     this.enabled.setValue(this.policyResponse.enabled);

apps/web/src/app/organizations/policies/master-password.component.ts

@@ -1,5 +1,5 @@
 import { Component } from "@angular/core";
-import { FormBuilder } from "@angular/forms";
+import { UntypedFormBuilder } from "@angular/forms";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { OrganizationService } from "@bitwarden/common/abstractions/organization.service";
@@ -32,7 +32,7 @@ export class MasterPasswordPolicyComponent extends BasePolicyComponent {
   showKeyConnectorInfo = false;
 
   constructor(
-    private formBuilder: FormBuilder,
+    private formBuilder: UntypedFormBuilder,
     i18nService: I18nService,
     private organizationService: OrganizationService
   ) {

apps/web/src/app/organizations/policies/password-generator.component.ts

@@ -1,5 +1,5 @@
 import { Component } from "@angular/core";
-import { FormBuilder } from "@angular/forms";
+import { UntypedFormBuilder } from "@angular/forms";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { PolicyType } from "@bitwarden/common/enums/policyType";
@@ -34,7 +34,7 @@ export class PasswordGeneratorPolicyComponent extends BasePolicyComponent {
 
   defaultTypes: { name: string; value: string }[];
 
-  constructor(private formBuilder: FormBuilder, i18nService: I18nService) {
+  constructor(private formBuilder: UntypedFormBuilder, i18nService: I18nService) {
     super();
 
     this.defaultTypes = [

apps/web/src/app/organizations/policies/reset-password.component.ts

@@ -1,5 +1,5 @@
 import { Component } from "@angular/core";
-import { FormBuilder } from "@angular/forms";
+import { UntypedFormBuilder } from "@angular/forms";
 
 import { OrganizationService } from "@bitwarden/common/abstractions/organization.service";
 import { PolicyType } from "@bitwarden/common/enums/policyType";
@@ -30,7 +30,10 @@ export class ResetPasswordPolicyComponent extends BasePolicyComponent {
   defaultTypes: { name: string; value: string }[];
   showKeyConnectorInfo = false;
 
-  constructor(private formBuilder: FormBuilder, private organizationService: OrganizationService) {
+  constructor(
+    private formBuilder: UntypedFormBuilder,
+    private organizationService: OrganizationService
+  ) {
     super();
   }
 

apps/web/src/app/organizations/policies/send-options.component.ts

@@ -1,5 +1,5 @@
 import { Component } from "@angular/core";
-import { FormBuilder } from "@angular/forms";
+import { UntypedFormBuilder } from "@angular/forms";
 
 import { PolicyType } from "@bitwarden/common/enums/policyType";
 
@@ -21,7 +21,7 @@ export class SendOptionsPolicyComponent extends BasePolicyComponent {
     disableHideEmail: false,
   });
 
-  constructor(private formBuilder: FormBuilder) {
+  constructor(private formBuilder: UntypedFormBuilder) {
     super();
   }
 }

apps/web/src/app/organizations/tools/import-export/org-export.component.ts

@@ -1,5 +1,5 @@
 import { Component } from "@angular/core";
-import { FormBuilder } from "@angular/forms";
+import { UntypedFormBuilder } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
 
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
@@ -11,6 +11,7 @@ import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { PolicyService } from "@bitwarden/common/abstractions/policy.service";
 import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service";
+import { EventType } from "@bitwarden/common/enums/eventType";
 
 import { ExportComponent } from "../../../tools/import-export/export.component";
 
@@ -29,7 +30,7 @@ export class OrganizationExportComponent extends ExportComponent {
     policyService: PolicyService,
     logService: LogService,
     userVerificationService: UserVerificationService,
-    formBuilder: FormBuilder,
+    formBuilder: UntypedFormBuilder,
     fileDownloadService: FileDownloadService
   ) {
     super(
@@ -66,7 +67,11 @@ export class OrganizationExportComponent extends ExportComponent {
   }
 
   async collectEvent(): Promise<any> {
-    // TODO
-    // await this.eventService.collect(EventType.Organization_ClientExportedVault);
+    await this.eventService.collect(
+      EventType.Organization_ClientExportedVault,
+      null,
+      null,
+      this.organizationId
+    );
   }
 }

apps/web/src/app/oss-routing.module.ts

@@ -63,10 +63,16 @@ const routes: Routes = [
       { path: "2fa", component: TwoFactorComponent, canActivate: [UnauthGuard] },
       {
         path: "register",
-        component: flagEnabled("showTrial") ? TrialInitiationComponent : RegisterComponent,
+        component: RegisterComponent,
         canActivate: [UnauthGuard],
         data: { titleId: "createAccount" },
       },
+      buildFlaggedRoute("showTrial", {
+        path: "trial",
+        component: TrialInitiationComponent,
+        canActivate: [UnauthGuard],
+        data: { titleId: "startTrial" },
+      }),
       {
         path: "sso",
         component: SsoComponent,

apps/web/src/app/send/access.component.ts

@@ -10,6 +10,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti
 import { SEND_KDF_ITERATIONS } from "@bitwarden/common/enums/kdfType";
 import { SendType } from "@bitwarden/common/enums/sendType";
 import { Utils } from "@bitwarden/common/misc/utils";
+import { EncArrayBuffer } from "@bitwarden/common/models/domain/encArrayBuffer";
 import { SendAccess } from "@bitwarden/common/models/domain/sendAccess";
 import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey";
 import { SendAccessRequest } from "@bitwarden/common/models/request/sendAccessRequest";
@@ -109,8 +110,8 @@ export class AccessComponent implements OnInit {
     }
 
     try {
-      const buf = await response.arrayBuffer();
-      const decBuf = await this.cryptoService.decryptFromBytes(buf, this.decKey);
+      const encBuf = await EncArrayBuffer.fromResponse(response);
+      const decBuf = await this.cryptoService.decryptFromBytes(encBuf, this.decKey);
       this.fileDownloadService.download({
         fileName: this.send.file.fileName,
         blobData: decBuf,

apps/web/src/app/settings/organization-plans.component.ts

@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from "@angular/core";
-import { FormBuilder, Validators } from "@angular/forms";
+import { UntypedFormBuilder, Validators } from "@angular/forms";
 import { Router } from "@angular/router";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
@@ -79,7 +79,7 @@ export class OrganizationPlansComponent implements OnInit {
     private organizationService: OrganizationService,
     private logService: LogService,
     private messagingService: MessagingService,
-    private formBuilder: FormBuilder
+    private formBuilder: UntypedFormBuilder
   ) {
     this.selfHosted = platformUtilsService.isSelfHost();
   }
@@ -452,6 +452,8 @@ export class OrganizationPlansComponent implements OnInit {
     const response = await this.apiService.postOrganizationLicense(fd);
     const orgId = response.id;
 
+    await this.apiService.refreshIdentityToken();
+
     // Org Keys live outside of the OrganizationLicense - add the keys to the org here
     const request = new OrganizationKeysRequest(orgKeys[0], orgKeys[1].encryptedString);
     await this.apiService.postOrganizationKeys(orgId, request);

apps/web/src/app/settings/preferences.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit } from "@angular/core";
-import { FormControl } from "@angular/forms";
+import { UntypedFormControl } from "@angular/forms";
 
 import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
@@ -25,7 +25,7 @@ export class PreferencesComponent implements OnInit {
   localeOptions: any[];
   themeOptions: any[];
 
-  vaultTimeout: FormControl = new FormControl(null);
+  vaultTimeout: UntypedFormControl = new UntypedFormControl(null);
 
   private startingLocale: string;
   private startingTheme: ThemeType;

apps/web/src/app/settings/settings.component.ts

@@ -6,7 +6,7 @@ import { OrganizationService } from "@bitwarden/common/abstractions/organization
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { TokenService } from "@bitwarden/common/abstractions/token.service";
 
-import { StateService } from "../../abstractions/state.service";
+import { StateService } from "../core";
 
 const BroadcasterSubscriptionId = "SettingsComponent";
 

apps/web/src/app/settings/sponsored-families.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit } from "@angular/core";
-import { FormBuilder, FormGroup, Validators } from "@angular/forms";
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from "@angular/forms";
 
 import { notAllowedValueAsync } from "@bitwarden/angular/validators/notAllowedValueAsync.validator";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
@@ -24,7 +24,7 @@ export class SponsoredFamiliesComponent implements OnInit {
   // Conditional display properties
   formPromise: Promise<any>;
 
-  sponsorshipForm: FormGroup;
+  sponsorshipForm: UntypedFormGroup;
 
   constructor(
     private apiService: ApiService,
@@ -32,7 +32,7 @@ export class SponsoredFamiliesComponent implements OnInit {
     private platformUtilsService: PlatformUtilsService,
     private syncService: SyncService,
     private organizationService: OrganizationService,
-    private formBuilder: FormBuilder,
+    private formBuilder: UntypedFormBuilder,
     private stateService: StateService
   ) {
     this.sponsorshipForm = this.formBuilder.group({

apps/web/src/app/tools/import-export/export.component.ts

@@ -1,5 +1,5 @@
 import { Component } from "@angular/core";
-import { FormBuilder } from "@angular/forms";
+import { UntypedFormBuilder } from "@angular/forms";
 
 import { ExportComponent as BaseExportComponent } from "@bitwarden/angular/components/export.component";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
@@ -28,7 +28,7 @@ export class ExportComponent extends BaseExportComponent {
     policyService: PolicyService,
     logService: LogService,
     userVerificationService: UserVerificationService,
-    formBuilder: FormBuilder,
+    formBuilder: UntypedFormBuilder,
     fileDownloadService: FileDownloadService
   ) {
     super(

apps/web/src/locales/af/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "U nuwe rekening is geskep! U kan nou aanteken."
   },
+  "trialAccountCreated": {
+    "message": "Account created successfully."
+  },
   "masterPassSent": {
     "message": "Ons het ’n e-pos gestuur met u hoofwagwoordwenk."
   },
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "Geaktiveer"
   },
-  "activate": {
-    "message": "Activate"
+  "restoreAccess": {
+    "message": "Restore Access"
   },
   "premium": {
     "message": "Premie",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "Deaktiveer"
   },
-  "deactivate": {
-    "message": "Deactivate"
+  "revokeAccess": {
+    "message": "Revoke Access"
   },
   "twoStepLoginProviderEnabled": {
     "message": "Hierdie tweestapaantekenaanbieder is vir u rekening geaktiveer."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "Fakturering"
   },
+  "billingPlanLabel": {
+    "message": "Billing Plan"
+  },
+  "paymentType": {
+    "message": "Payment Type"
+  },
   "accountCredit": {
     "message": "Rekeningkrediet",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "jaar"
   },
+  "yr": {
+    "message": "yr"
+  },
   "month": {
     "message": "maand"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Faktureringsinligting"
   },
+  "billingTrialSubLabel": {
+    "message": "Your payment method will not be charged during the 7 day free trial."
+  },
   "creditCard": {
     "message": "Kredietkaart"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Thanks for signing up for Bitwarden for $PLAN$!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "Your $PLAN$ 7 day free trial will be converted to a paid subscription after 7 days.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "We've sent a confirmation email to your team's billing email at "
+  },
   "monthly": {
     "message": "Maandeliks"
   },
   "annually": {
     "message": "Jaarliks"
   },
+  "annual": {
+    "message": "Annual"
+  },
   "basePrice": {
     "message": "Basisprys"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "Is u seker u wil hierdie gebruiker verwyder?"
   },
-  "deactivateUserConfirmation": {
-    "message": "The member will no longer have access to the organization, but will still have access to their individual vault."
+  "removeOrgUserConfirmation": {
+    "message": "When a member is removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again."
   },
-  "activateUserConfirmation": {
-    "message": "Are you sure you want to activate this user, granting them access to the organization?"
+  "revokeUserConfirmation": {
+    "message": "When a member is revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Waarskuwing! Hierdie gebruiker vereis Key Connector om hul enkripsie te bestuur. Indien u die gebruiker uit u organisasie verwyder, word sy rekening permanent gedeaktiveer. Dit kan nie ontdaan word nie. Wil u voortgaan?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Deactivated user $ID$.",
+  "removeUserIdAccess": {
+    "message": "Remove $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Activated user $ID$.",
+  "revokedUserId": {
+    "message": "Revoked organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Deactivate user $ID$?",
+  "restoredUserId": {
+    "message": "Restored organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Activate user $ID$?",
+  "revokeUserId": {
+    "message": "Revoke $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "Gedeaktiveer"
   },
-  "deactivated": {
-    "message": "Deactivated"
+  "revoked": {
+    "message": "Revoked"
   },
   "sendLink": {
     "message": "Send-skakel",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "Is u seker u wil die volgende gebruikers verwyder? Die proses duur enkele sekondes en kan nie onderbreek of gekanselleer word nie."
   },
-  "deactivateUsersWarning": {
-    "message": "Are you sure you want to deactivate the following members? They will no longer have access to the organization, but will still have access to their individual vaults. The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "removeOrgUsersConfirmation": {
+    "message": "When member(s) are removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "activateUsersWarning": {
-    "message": "Are you sure you want to activate the following members, granting them access to the organization? The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "revokeUsersWarning": {
+    "message": "When member(s) are revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
   "theme": {
     "message": "Tema"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "Suksesvol verwyder"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Deactivated successfully"
+  "bulkRevokedMessage": {
+    "message": "Revoked organization access successfully"
   },
-  "bulkActivatedMessage": {
-    "message": "Activated successfully"
+  "bulkRestoredMessage": {
+    "message": "Restored organization access successfully"
   },
   "bulkFilteredMessage": {
     "message": "Uitgesluit, nie van toepassing vir hierdie aksie."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "Verwyder gebruikers"
   },
-  "deactivateUsers": {
-    "message": "Deactivate Users"
+  "revokeUsers": {
+    "message": "Revoke Users"
   },
-  "activateUsers": {
-    "message": "Activate Users"
+  "restoreUsers": {
+    "message": "Restore Users"
   },
   "error": {
     "message": "Fout"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Borgskap is geskep"
   },
-  "revoke": {
-    "message": "Herroep"
-  },
   "emailSent": {
     "message": "Email Sent"
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "SCIM Provisioning",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Enable SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Set up your preferred identity provider by configuring the URL and SCIM API Key",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "This API key has access to manage users within your organization. It should be kept secret."
+  },
+  "copyScimKey": {
+    "message": "Copy the SCIM API Key to your clipboard",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Rotate the SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Are you sure you want to rotate the SCIM API Key? The current key will no longer work for any existing integrations.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Rotate Key"
+  },
+  "scimApiKey": {
+    "message": "SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Copy the SCIM endpoint URL to your clipboard",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "SCIM URL",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "The SCIM API Key has been successfully rotated",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "SCIM settings have been saved successfully",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Input is required."
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "On"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/ar/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "تم إنشاء حساب جديد لك! بإمكانك الآن تسجيل الدخول."
   },
+  "trialAccountCreated": {
+    "message": "Account created successfully."
+  },
   "masterPassSent": {
     "message": "We've sent you an email with your master password hint."
   },
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "Enabled"
   },
-  "activate": {
-    "message": "Activate"
+  "restoreAccess": {
+    "message": "Restore Access"
   },
   "premium": {
     "message": "بريميوم",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "Disable"
   },
-  "deactivate": {
-    "message": "Deactivate"
+  "revokeAccess": {
+    "message": "Revoke Access"
   },
   "twoStepLoginProviderEnabled": {
     "message": "This two-step login provider is enabled on your account."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "Billing"
   },
+  "billingPlanLabel": {
+    "message": "Billing Plan"
+  },
+  "paymentType": {
+    "message": "Payment Type"
+  },
   "accountCredit": {
     "message": "Account Credit",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "year"
   },
+  "yr": {
+    "message": "yr"
+  },
   "month": {
     "message": "month"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Billing Information"
   },
+  "billingTrialSubLabel": {
+    "message": "Your payment method will not be charged during the 7 day free trial."
+  },
   "creditCard": {
     "message": "بطاقة ائتمان"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Thanks for signing up for Bitwarden for $PLAN$!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "Your $PLAN$ 7 day free trial will be converted to a paid subscription after 7 days.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "We've sent a confirmation email to your team's billing email at "
+  },
   "monthly": {
     "message": "Monthly"
   },
   "annually": {
     "message": "Annually"
   },
+  "annual": {
+    "message": "Annual"
+  },
   "basePrice": {
     "message": "Base Price"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "Are you sure you want to remove this user?"
   },
-  "deactivateUserConfirmation": {
-    "message": "The member will no longer have access to the organization, but will still have access to their individual vault."
+  "removeOrgUserConfirmation": {
+    "message": "When a member is removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again."
   },
-  "activateUserConfirmation": {
-    "message": "Are you sure you want to activate this user, granting them access to the organization?"
+  "revokeUserConfirmation": {
+    "message": "When a member is revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Warning! This user requires Key Connector to manage their encryption. Removing this user from your organization will permanently disable their account. This action cannot be undone. Do you want to proceed?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Deactivated user $ID$.",
+  "removeUserIdAccess": {
+    "message": "Remove $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Activated user $ID$.",
+  "revokedUserId": {
+    "message": "Revoked organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Deactivate user $ID$?",
+  "restoredUserId": {
+    "message": "Restored organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Activate user $ID$?",
+  "revokeUserId": {
+    "message": "Revoke $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "Disabled"
   },
-  "deactivated": {
-    "message": "Deactivated"
+  "revoked": {
+    "message": "Revoked"
   },
   "sendLink": {
     "message": "Send link",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "Are you sure you want to remove the following users? The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "deactivateUsersWarning": {
-    "message": "Are you sure you want to deactivate the following members? They will no longer have access to the organization, but will still have access to their individual vaults. The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "removeOrgUsersConfirmation": {
+    "message": "When member(s) are removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "activateUsersWarning": {
-    "message": "Are you sure you want to activate the following members, granting them access to the organization? The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "revokeUsersWarning": {
+    "message": "When member(s) are revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
   "theme": {
     "message": "المظهر"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "Removed successfully"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Deactivated successfully"
+  "bulkRevokedMessage": {
+    "message": "Revoked organization access successfully"
   },
-  "bulkActivatedMessage": {
-    "message": "Activated successfully"
+  "bulkRestoredMessage": {
+    "message": "Restored organization access successfully"
   },
   "bulkFilteredMessage": {
     "message": "Excluded, not applicable for this action."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "Remove Users"
   },
-  "deactivateUsers": {
-    "message": "Deactivate Users"
+  "revokeUsers": {
+    "message": "Revoke Users"
   },
-  "activateUsers": {
-    "message": "Activate Users"
+  "restoreUsers": {
+    "message": "Restore Users"
   },
   "error": {
     "message": "خطأ"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Sponsorship Created"
   },
-  "revoke": {
-    "message": "Revoke"
-  },
   "emailSent": {
     "message": "تم إرسال البريد الإلكتروني"
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "SCIM Provisioning",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Enable SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Set up your preferred identity provider by configuring the URL and SCIM API Key",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "This API key has access to manage users within your organization. It should be kept secret."
+  },
+  "copyScimKey": {
+    "message": "Copy the SCIM API Key to your clipboard",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Rotate the SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Are you sure you want to rotate the SCIM API Key? The current key will no longer work for any existing integrations.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Rotate Key"
+  },
+  "scimApiKey": {
+    "message": "SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Copy the SCIM endpoint URL to your clipboard",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "SCIM URL",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "The SCIM API Key has been successfully rotated",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "SCIM settings have been saved successfully",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Input is required."
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "On"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/az/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "Yeni hesabınız yaradıldı! İndi giriş edə bilərsiniz."
   },
+  "trialAccountCreated": {
+    "message": "Hesab uğurla yaradıldı."
+  },
   "masterPassSent": {
     "message": "Ana parol məsləhətini ehtiva edən bir e-poçt göndərdik."
   },
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "Fəallaşdırıldı"
   },
-  "activate": {
-    "message": "Aktiv et"
+  "restoreAccess": {
+    "message": "Müraciəti bərpa et"
   },
   "premium": {
     "message": "Premium",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "Sıradan çıxart"
   },
-  "deactivate": {
-    "message": "Deaktiv et"
+  "revokeAccess": {
+    "message": "Müraciəti ləğv et"
   },
   "twoStepLoginProviderEnabled": {
     "message": "Bu iki mərhələli giriş təchizatçısı hesabınızda fəallaşdırılıb."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "Faktura"
   },
+  "billingPlanLabel": {
+    "message": "Faktura planı"
+  },
+  "paymentType": {
+    "message": "Ödəniş növü"
+  },
   "accountCredit": {
     "message": "Hesab krediti",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "il"
   },
+  "yr": {
+    "message": "il"
+  },
   "month": {
     "message": "ay"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Faktura məlumatı"
   },
+  "billingTrialSubLabel": {
+    "message": "7 günlük ödənişsiz sınaq müddətində ödəniş metodunuzdan pul alınmayacaq."
+  },
   "creditCard": {
     "message": "Kredit kartı"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "$PLAN$ qarşılığında Bitwarden-də qeydiyyatdan keçdiyiniz üçün təşəkkürlər!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "7 gün ödənişsiz sınaq $PLAN$, 7 gün sonra ödənişli abunəliyə çevriləcək.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "Komandanızın faktura e-poçtuna təsdiq məktubu göndərdik "
+  },
   "monthly": {
     "message": "Aylıq"
   },
   "annually": {
     "message": "İllik"
   },
+  "annual": {
+    "message": "İllik"
+  },
   "basePrice": {
     "message": "Baza qiyməti"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "Bu istifadəçini çıxartmaq istədiyinizə əminsiniz?"
   },
-  "deactivateUserConfirmation": {
-    "message": "Üzv, artıq təşkilata müraciət edə bilməyəcək, ancaq fərdi anbarına müraciət etməyə davam edəcək."
+  "removeOrgUserConfirmation": {
+    "message": "Bir üzv silinəndə, artıq onun təşkilat verilənlərinə müraciəti olmur və bu əməliyyatın geri dönüşü yoxdur. Üzvü təşkilata yenidən əlavə etmək üçün, onların dəvət edilib təkrar qoşulmaları lazımdır."
   },
-  "activateUserConfirmation": {
-    "message": "Bu istifadəçini aktivləşdirərək onun təşkilata müraciətinə icazə verirsiniz?"
+  "revokeUserConfirmation": {
+    "message": "Bir üzv ləğv ediləndə, artıq onun təşkilat verilənlərinə müraciəti olmur. Üzv müraciətini daha tez bərpa etmək üçün, Ləğv edilənlər vərəqinə gedin."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Xəbərdarlıq! Bu istifadəçi, şifrələmələrini idarə etmək üçün Açar Bağlayıcı tələb edir. Bu istifadəçini təşkilatınızdan silsəniz, hesabı birdəfəlik sıradan çıxarılacaq. Bu əməliyyatın geri dönüşü yoxdur. Davam etmək istəyirsiniz?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "$ID$ istifadəçisi deaktiv edildi.",
+  "removeUserIdAccess": {
+    "message": "$ID$ müraciətini sil",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "$ID$ istifadəçisi aktiv edildi.",
+  "revokedUserId": {
+    "message": "$ID$ üçün təşkilat müraciəti ləğv edildi.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "$ID$ istifadəçisi deaktiv edilsin?",
+  "restoredUserId": {
+    "message": "$ID$ üçün təşkilat müraciəti bərpa edildi.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "$ID$ istifadəçisi aktiv edilsin?",
+  "revokeUserId": {
+    "message": "$ID$ müraciətini ləğv et",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "Sıradan çıxarıldı"
   },
-  "deactivated": {
-    "message": "Deaktiv edildi"
+  "revoked": {
+    "message": "Ləğv edildi"
   },
   "sendLink": {
     "message": "\"Send\" bağlantısı",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "Aşağıdakı istifadəçiləri çıxartmaq istədiyinizə əminsiniz? Bu prosesin tamamlanması bir neçə saniyə çəkir, ləğv edilə və ya dayandırıla bilməz."
   },
-  "deactivateUsersWarning": {
-    "message": "Aşağıdakı üzvləri deaktiv etmək istədiyinizə əminsiniz? Təşkilata müraciət edə bilməyəcəklər, ancaq fərdi anbarlarına müraciət etməyə davam edəcəklər. Bu prosesin tamamlanması bir neçə saniyə çəkir, ləğv edilə və ya dayandırıla bilməz."
+  "removeOrgUsersConfirmation": {
+    "message": "Üzv(lər) silinəndə, artıq onun/onların təşkilat verilənlərinə müraciəti olmur və bu əməliyyatın geri dönüşü yoxdur. Üzvü təşkilata yenidən əlavə etmək üçün, onların dəvət edilib təkrar qoşulmaları lazımdır. Prosesin tamamlanması bir neçə saniyə çəkə bilər, bu proses dayandırıla və ya ləğv edilə bilməz."
   },
-  "activateUsersWarning": {
-    "message": "Aşağıdakı istifadəçiləri aktiv etmək istədiyinizə əminsiniz? Bu prosesin tamamlanması bir neçə saniyə çəkir, ləğv edilə və ya dayandırıla bilməz."
+  "revokeUsersWarning": {
+    "message": "Üzv(lər) ləğv ediləndə, artıq onun/onların təşkilat verilənlərinə müraciəti olmur. Üzv müraciətini daha tez bərpa etmək üçün, Ləğv edilənlər vərəqinə gedin. Prosesin tamamlanması bir neçə saniyə çəkə bilər, bu proses dayandırıla və ya ləğv edilə bilməz."
   },
   "theme": {
     "message": "Tema"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "Uğurla çıxarıldı"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Uğurla deaktiv edildi"
+  "bulkRevokedMessage": {
+    "message": "Təşkilat müraciəti uğurla ləğv edildi"
   },
-  "bulkActivatedMessage": {
-    "message": "Uğurla aktiv edildi"
+  "bulkRestoredMessage": {
+    "message": "Təşkilat müraciəti uğurla bərpa edildi"
   },
   "bulkFilteredMessage": {
     "message": "İstisna edildi, bu əməliyyat üçün etibarlı deyil."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "İstifadəçiləri çıxart"
   },
-  "deactivateUsers": {
-    "message": "İstifadəçiləri deaktiv et"
+  "revokeUsers": {
+    "message": "İstifadəçiləri ləğv et"
   },
-  "activateUsers": {
-    "message": "İstifadəçiləri aktiv et"
+  "restoreUsers": {
+    "message": "İstifadəçiləri bərpa et"
   },
   "error": {
     "message": "Xəta"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Sponsorluq yaradıldı"
   },
-  "revoke": {
-    "message": "Geri al"
-  },
   "emailSent": {
     "message": "E-poçt göndərildi"
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "SCIM Təminatı",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "SCIM təmin etmə vasitəsilə tərcih etdiyiniz kimlik təsdiqləmə provayderləri ilə istifadəçiləri və qrupları avtomatik təmin edin",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "SCIM-i fəallaşdır",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "URL və SCIM API açarını konfiqurasiya edərək tərcih etdiyiniz kimlik təsdiqləmə provayderini quraşdırın",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "Bu API açarı, təşkilatınızdakı istifadəçiləri idarə etmə müraciətinə sahibdir. Gizli saxlanılmalıdır."
+  },
+  "copyScimKey": {
+    "message": "SCIM API açarını lövhəyə kopyala",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "SCIM API açarını döndər",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "SCIM API açarını döndərmək istədiyinizə əminsiniz? Hazırkı açar, mövcud heç bir inteqrasiya üçün işləməyəcək.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Açarı döndər"
+  },
+  "scimApiKey": {
+    "message": "SCIM API açarı",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "SCIM uc nöqtə URL-sini lövhəyə kopyala",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "SCIM URL",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "SCIM API açarı uğurla döndərildi",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "SCIM tənzimləmələri uğurla saxlanıldı",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Giriş lazımdır."
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "Açıqdır"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/be/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "Ваш уліковы запіс створаны! Вы можаце ўвайсці."
   },
+  "trialAccountCreated": {
+    "message": "Account created successfully."
+  },
   "masterPassSent": {
     "message": "Мы адправілі вам на электронную пошту падказку для асноўнага пароля."
   },
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "Уключана"
   },
-  "activate": {
-    "message": "Activate"
+  "restoreAccess": {
+    "message": "Restore Access"
   },
   "premium": {
     "message": "Прэміяльны статус",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "Адключыць"
   },
-  "deactivate": {
-    "message": "Deactivate"
+  "revokeAccess": {
+    "message": "Revoke Access"
   },
   "twoStepLoginProviderEnabled": {
     "message": "This two-step login provider is enabled on your account."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "Billing"
   },
+  "billingPlanLabel": {
+    "message": "Billing Plan"
+  },
+  "paymentType": {
+    "message": "Payment Type"
+  },
   "accountCredit": {
     "message": "Account Credit",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "year"
   },
+  "yr": {
+    "message": "yr"
+  },
   "month": {
     "message": "month"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Billing Information"
   },
+  "billingTrialSubLabel": {
+    "message": "Your payment method will not be charged during the 7 day free trial."
+  },
   "creditCard": {
     "message": "Credit Card"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Thanks for signing up for Bitwarden for $PLAN$!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "Your $PLAN$ 7 day free trial will be converted to a paid subscription after 7 days.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "We've sent a confirmation email to your team's billing email at "
+  },
   "monthly": {
     "message": "Monthly"
   },
   "annually": {
     "message": "Annually"
   },
+  "annual": {
+    "message": "Annual"
+  },
   "basePrice": {
     "message": "Base Price"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "Are you sure you want to remove this user?"
   },
-  "deactivateUserConfirmation": {
-    "message": "The member will no longer have access to the organization, but will still have access to their individual vault."
+  "removeOrgUserConfirmation": {
+    "message": "When a member is removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again."
   },
-  "activateUserConfirmation": {
-    "message": "Are you sure you want to activate this user, granting them access to the organization?"
+  "revokeUserConfirmation": {
+    "message": "When a member is revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Warning! This user requires Key Connector to manage their encryption. Removing this user from your organization will permanently disable their account. This action cannot be undone. Do you want to proceed?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Deactivated user $ID$.",
+  "removeUserIdAccess": {
+    "message": "Remove $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Activated user $ID$.",
+  "revokedUserId": {
+    "message": "Revoked organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Deactivate user $ID$?",
+  "restoredUserId": {
+    "message": "Restored organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Activate user $ID$?",
+  "revokeUserId": {
+    "message": "Revoke $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "Disabled"
   },
-  "deactivated": {
-    "message": "Deactivated"
+  "revoked": {
+    "message": "Revoked"
   },
   "sendLink": {
     "message": "Send link",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "Are you sure you want to remove the following users? The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "deactivateUsersWarning": {
-    "message": "Are you sure you want to deactivate the following members? They will no longer have access to the organization, but will still have access to their individual vaults. The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "removeOrgUsersConfirmation": {
+    "message": "When member(s) are removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "activateUsersWarning": {
-    "message": "Are you sure you want to activate the following members, granting them access to the organization? The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "revokeUsersWarning": {
+    "message": "When member(s) are revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
   "theme": {
     "message": "Theme"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "Removed successfully"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Deactivated successfully"
+  "bulkRevokedMessage": {
+    "message": "Revoked organization access successfully"
   },
-  "bulkActivatedMessage": {
-    "message": "Activated successfully"
+  "bulkRestoredMessage": {
+    "message": "Restored organization access successfully"
   },
   "bulkFilteredMessage": {
     "message": "Excluded, not applicable for this action."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "Remove Users"
   },
-  "deactivateUsers": {
-    "message": "Deactivate Users"
+  "revokeUsers": {
+    "message": "Revoke Users"
   },
-  "activateUsers": {
-    "message": "Activate Users"
+  "restoreUsers": {
+    "message": "Restore Users"
   },
   "error": {
     "message": "Error"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Sponsorship Created"
   },
-  "revoke": {
-    "message": "Revoke"
-  },
   "emailSent": {
     "message": "Email Sent"
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "SCIM Provisioning",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Enable SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Set up your preferred identity provider by configuring the URL and SCIM API Key",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "This API key has access to manage users within your organization. It should be kept secret."
+  },
+  "copyScimKey": {
+    "message": "Copy the SCIM API Key to your clipboard",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Rotate the SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Are you sure you want to rotate the SCIM API Key? The current key will no longer work for any existing integrations.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Rotate Key"
+  },
+  "scimApiKey": {
+    "message": "SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Copy the SCIM endpoint URL to your clipboard",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "SCIM URL",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "The SCIM API Key has been successfully rotated",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "SCIM settings have been saved successfully",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Input is required."
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "On"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/bg/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "Абонаментът ви бе създаден. Вече можете да се впишете."
   },
+  "trialAccountCreated": {
+    "message": "Регистрацията е създадена успешно."
+  },
   "masterPassSent": {
     "message": "Изпратихме ви писмо с подсказка за главната ви парола."
   },
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "Включено"
   },
-  "activate": {
-    "message": "Активиране"
+  "restoreAccess": {
+    "message": "Възстановяване на достъпа"
   },
   "premium": {
     "message": "Платен",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "Изключване"
   },
-  "deactivate": {
-    "message": "Деактивиране"
+  "revokeAccess": {
+    "message": "Отнемане на достъпа"
   },
   "twoStepLoginProviderEnabled": {
     "message": "Този доставчик на двустепенно удостоверяване е включен за абонамента ви."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "Заплащане"
   },
+  "billingPlanLabel": {
+    "message": "Платежен план"
+  },
+  "paymentType": {
+    "message": "Вид плащане"
+  },
   "accountCredit": {
     "message": "Кредит по абонамента",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "година"
   },
+  "yr": {
+    "message": "година"
+  },
   "month": {
     "message": "месец"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Информация за фактуриране"
   },
+  "billingTrialSubLabel": {
+    "message": "Няма да получите задължение за плащане по време на 7-дневния пробен период."
+  },
   "creditCard": {
     "message": "Кредитна карта"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Благодарим Ви, че се регистрирахте в Битуорден и избрахте плана $PLAN$!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "След като Вашият 7-дневен безплатен пробен период на плана $PLAN$ изтече, той ще бъде превърнат в платен абонамент.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "Изпратихме Ви е-писмо за потвърждение до е-пощата на екипа Ви, на адрес: "
+  },
   "monthly": {
     "message": "Месечно"
   },
   "annually": {
     "message": "Годишно"
   },
+  "annual": {
+    "message": "Annual"
+  },
   "basePrice": {
     "message": "Базова цена"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "Сигурни ли сте, че искате да изтриете този потребител?"
   },
-  "deactivateUserConfirmation": {
-    "message": "Този член вече няма да има достъп до организацията, но ще продължи да има достъп до собствения си трезор."
+  "removeOrgUserConfirmation": {
+    "message": "Когато член бъде премахнат, той вече няма да има достъп до данните на организацията. Това действие е необратимо. Ако след това искате да върнете потребителя в организацията, той трябва отново да бъде поканен и въведен в нея."
   },
-  "activateUserConfirmation": {
-    "message": "Наистина ли искате да активирате този потребител, давайки му така достъп до организацията?"
+  "revokeUserConfirmation": {
+    "message": "Когато достъпът на член бъде отнет, той няма да може да разполага с данните в организацията. Ако искате да върнете достъпа му, идете в раздела „Отнет достъп“."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Внимание! Този потребител има нужда от конектор за ключове, за да управлява шифроването си. Ако премахнете потребителя от организацията, ще заключите завинаги достъпа му до неговата регистрация. Това действие е необратимо. Наистина ли искате да продължите?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Деактивиран потребител: $ID$.",
+  "removeUserIdAccess": {
+    "message": "Премахване на достъпа на $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Активиран потребител: $ID$.",
+  "revokedUserId": {
+    "message": "Достъпът на $ID$ до организацията е отнет.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Деактивиране на потребител $ID$?",
+  "restoredUserId": {
+    "message": "Достъпът на $ID$ до организацията е възстановен.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Активиране на потребител $ID$?",
+  "revokeUserId": {
+    "message": "Отнемане на достъпа на $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3219,7 +3258,7 @@
     "message": "Организацията е изключена."
   },
   "disabledOrganizationFilterError": {
-    "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+    "message": "Записите в изключени организации не са достъпни. Свържете се със собственика на организацията си за помощ."
   },
   "licenseIsExpired": {
     "message": "Изтекъл лиценз."
@@ -3346,13 +3385,13 @@
     "message": "Дублиране"
   },
   "masterPassPolicyTitle": {
-    "message": "Master password requirements"
+    "message": "Изисквания за главната парола"
   },
   "masterPassPolicyDesc": {
     "message": "Задаване на минимална сила на главната парола."
   },
   "twoStepLoginPolicyTitle": {
-    "message": "Require two-step login"
+    "message": "Изискване на двустепенно удостоверяване"
   },
   "twoStepLoginPolicyDesc": {
     "message": "Изискване от потребителите да включат двустепенно удостоверяване за личните си абонаменти."
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "Изключено"
   },
-  "deactivated": {
-    "message": "Деактивиран"
+  "revoked": {
+    "message": "Отнет достъп"
   },
   "sendLink": {
     "message": "Изпращане на връзката",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "Наистина ли искате да премахнете следните потребители? Процесът може да отнеме няколко секунди и не може да бъде прекъснат или отменен."
   },
-  "deactivateUsersWarning": {
-    "message": "Наистина ли искате да деактивирате следните членове? Те вече няма да имат достъп до организацията, но ще продължат да имат достъп до собствените си трезори. Процедурата ще отнеме няколко секунди и не трябва да бъде прекъсвана или отменяна."
+  "removeOrgUsersConfirmation": {
+    "message": "Когато член бъде премахнат, той вече няма да има достъп до данните на организацията. Това действие е необратимо. Ако след това искате да върнете потребителя в организацията, той трябва отново да бъде поканен и въведен в нея. Процесът може да отнеме няколко секунди и не трябва да бъде прекъсван."
   },
-  "activateUsersWarning": {
-    "message": "Наистина ли искате да активирате следните потребители, давайки им така достъп до организацията? Процесът може да отнеме няколко секунди и не може да бъде прекъснат или отменен."
+  "revokeUsersWarning": {
+    "message": "Когато достъпът на член бъде отнет, той няма да може да разполага с данните в организацията. Ако искате да върнете достъпа му, идете в раздела „Отнет достъп“. Процесът може да отнеме няколко секунди и не трябва да бъде прекъсван."
   },
   "theme": {
     "message": "Облик"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "Успешно премахване"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Успешно деактивиране"
+  "bulkRevokedMessage": {
+    "message": "Достъпът до организацията е отнет успешно"
   },
-  "bulkActivatedMessage": {
-    "message": "Успешно активиране"
+  "bulkRestoredMessage": {
+    "message": "Достъпът до организацията е възстановен успешно"
   },
   "bulkFilteredMessage": {
     "message": "Изключени като неподходящи за това действие."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "Премахване на потребителите"
   },
-  "deactivateUsers": {
-    "message": "Деактивиране на потребители"
+  "revokeUsers": {
+    "message": "Отнемане на достъпа на потребители"
   },
-  "activateUsers": {
-    "message": "Активиране на потребители"
+  "restoreUsers": {
+    "message": "Възстановяване на достъпа на потребители"
   },
   "error": {
     "message": "Грешка"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Sponsorship Created"
   },
-  "revoke": {
-    "message": "Revoke"
-  },
   "emailSent": {
     "message": "Писмото е изпратено"
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "Удостоверяване чрез SCIM",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Предоставете на потребителите и групите си автоматично удостоверяване със своя предпочитан доставчик на удостоверителни данни като използвате удостоверяване чрез SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Включване на SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Задайте предпочитания си доставчик на удостоверителни данни като настроите адреса и ключа за API на SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "Този ключ за API предоставя достъп за управление на потребителите в организацията Ви. Трябва да го пазите в тайна."
+  },
+  "copyScimKey": {
+    "message": "Копиране на ключа за API на SCIM в буфера",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Смяна на ключа за API на SCIM",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Наистина ли искате да смените ключа за API на SCIM? Текущият ключ ще спре да работи за вече настроените интеграции.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Смяна на ключа"
+  },
+  "scimApiKey": {
+    "message": "Ключ за API на SCIM",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Копиране на адреса на SCIM в буфера",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "Адрес на SCIM",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "Ключът за API на SCIM беше сменен успешно",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "Настройките за SCIM бяха запазени успешно",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Полето е задължтелно да бъде попълнено."
   },
@@ -5209,9 +5299,12 @@
     }
   },
   "turnOn": {
-    "message": "Turn on"
+    "message": "Включване"
   },
   "on": {
-    "message": "On"
+    "message": "Включено"
+  },
+  "cardBrandMir": {
+    "message": "Мир"
   }
 }

apps/web/src/locales/bn/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "আপনার নতুন অ্যাকাউন্ট তৈরি করা হয়েছে! আপনি এখন প্রবেশ করতে পারেন।"
   },
+  "trialAccountCreated": {
+    "message": "Account created successfully."
+  },
   "masterPassSent": {
     "message": "আমরা আপনাকে আপনার মূল পাসওয়ার্ডের ইঙ্গিতসহ একটি ইমেল প্রেরণ করেছি।"
   },
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "Enabled"
   },
-  "activate": {
-    "message": "Activate"
+  "restoreAccess": {
+    "message": "Restore Access"
   },
   "premium": {
     "message": "প্রিমিয়াম",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "Disable"
   },
-  "deactivate": {
-    "message": "Deactivate"
+  "revokeAccess": {
+    "message": "Revoke Access"
   },
   "twoStepLoginProviderEnabled": {
     "message": "This two-step login provider is enabled on your account."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "Billing"
   },
+  "billingPlanLabel": {
+    "message": "Billing Plan"
+  },
+  "paymentType": {
+    "message": "Payment Type"
+  },
   "accountCredit": {
     "message": "Account Credit",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "বছর"
   },
+  "yr": {
+    "message": "yr"
+  },
   "month": {
     "message": "মাস"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Billing Information"
   },
+  "billingTrialSubLabel": {
+    "message": "Your payment method will not be charged during the 7 day free trial."
+  },
   "creditCard": {
     "message": "Credit Card"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Thanks for signing up for Bitwarden for $PLAN$!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "Your $PLAN$ 7 day free trial will be converted to a paid subscription after 7 days.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "We've sent a confirmation email to your team's billing email at "
+  },
   "monthly": {
     "message": "Monthly"
   },
   "annually": {
     "message": "Annually"
   },
+  "annual": {
+    "message": "Annual"
+  },
   "basePrice": {
     "message": "Base Price"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "Are you sure you want to remove this user?"
   },
-  "deactivateUserConfirmation": {
-    "message": "The member will no longer have access to the organization, but will still have access to their individual vault."
+  "removeOrgUserConfirmation": {
+    "message": "When a member is removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again."
   },
-  "activateUserConfirmation": {
-    "message": "Are you sure you want to activate this user, granting them access to the organization?"
+  "revokeUserConfirmation": {
+    "message": "When a member is revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Warning! This user requires Key Connector to manage their encryption. Removing this user from your organization will permanently disable their account. This action cannot be undone. Do you want to proceed?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Deactivated user $ID$.",
+  "removeUserIdAccess": {
+    "message": "Remove $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Activated user $ID$.",
+  "revokedUserId": {
+    "message": "Revoked organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Deactivate user $ID$?",
+  "restoredUserId": {
+    "message": "Restored organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Activate user $ID$?",
+  "revokeUserId": {
+    "message": "Revoke $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "Disabled"
   },
-  "deactivated": {
-    "message": "Deactivated"
+  "revoked": {
+    "message": "Revoked"
   },
   "sendLink": {
     "message": "লিঙ্ক পাঠান",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "Are you sure you want to remove the following users? The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "deactivateUsersWarning": {
-    "message": "Are you sure you want to deactivate the following members? They will no longer have access to the organization, but will still have access to their individual vaults. The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "removeOrgUsersConfirmation": {
+    "message": "When member(s) are removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "activateUsersWarning": {
-    "message": "Are you sure you want to activate the following members, granting them access to the organization? The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "revokeUsersWarning": {
+    "message": "When member(s) are revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
   "theme": {
     "message": "Theme"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "Removed successfully"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Deactivated successfully"
+  "bulkRevokedMessage": {
+    "message": "Revoked organization access successfully"
   },
-  "bulkActivatedMessage": {
-    "message": "Activated successfully"
+  "bulkRestoredMessage": {
+    "message": "Restored organization access successfully"
   },
   "bulkFilteredMessage": {
     "message": "Excluded, not applicable for this action."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "Remove Users"
   },
-  "deactivateUsers": {
-    "message": "Deactivate Users"
+  "revokeUsers": {
+    "message": "Revoke Users"
   },
-  "activateUsers": {
-    "message": "Activate Users"
+  "restoreUsers": {
+    "message": "Restore Users"
   },
   "error": {
     "message": "Error"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Sponsorship Created"
   },
-  "revoke": {
-    "message": "Revoke"
-  },
   "emailSent": {
     "message": "Email Sent"
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "SCIM Provisioning",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Enable SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Set up your preferred identity provider by configuring the URL and SCIM API Key",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "This API key has access to manage users within your organization. It should be kept secret."
+  },
+  "copyScimKey": {
+    "message": "Copy the SCIM API Key to your clipboard",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Rotate the SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Are you sure you want to rotate the SCIM API Key? The current key will no longer work for any existing integrations.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Rotate Key"
+  },
+  "scimApiKey": {
+    "message": "SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Copy the SCIM endpoint URL to your clipboard",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "SCIM URL",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "The SCIM API Key has been successfully rotated",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "SCIM settings have been saved successfully",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Input is required."
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "On"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/bs/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "Your new account has been created! You may now log in."
   },
+  "trialAccountCreated": {
+    "message": "Account created successfully."
+  },
   "masterPassSent": {
     "message": "We've sent you an email with your master password hint."
   },
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "Enabled"
   },
-  "activate": {
-    "message": "Activate"
+  "restoreAccess": {
+    "message": "Restore Access"
   },
   "premium": {
     "message": "Premium",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "Disable"
   },
-  "deactivate": {
-    "message": "Deactivate"
+  "revokeAccess": {
+    "message": "Revoke Access"
   },
   "twoStepLoginProviderEnabled": {
     "message": "This two-step login provider is enabled on your account."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "Billing"
   },
+  "billingPlanLabel": {
+    "message": "Billing Plan"
+  },
+  "paymentType": {
+    "message": "Payment Type"
+  },
   "accountCredit": {
     "message": "Account Credit",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "year"
   },
+  "yr": {
+    "message": "yr"
+  },
   "month": {
     "message": "month"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Billing Information"
   },
+  "billingTrialSubLabel": {
+    "message": "Your payment method will not be charged during the 7 day free trial."
+  },
   "creditCard": {
     "message": "Credit Card"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Thanks for signing up for Bitwarden for $PLAN$!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "Your $PLAN$ 7 day free trial will be converted to a paid subscription after 7 days.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "We've sent a confirmation email to your team's billing email at "
+  },
   "monthly": {
     "message": "Monthly"
   },
   "annually": {
     "message": "Annually"
   },
+  "annual": {
+    "message": "Annual"
+  },
   "basePrice": {
     "message": "Base Price"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "Are you sure you want to remove this user?"
   },
-  "deactivateUserConfirmation": {
-    "message": "The member will no longer have access to the organization, but will still have access to their individual vault."
+  "removeOrgUserConfirmation": {
+    "message": "When a member is removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again."
   },
-  "activateUserConfirmation": {
-    "message": "Are you sure you want to activate this user, granting them access to the organization?"
+  "revokeUserConfirmation": {
+    "message": "When a member is revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Warning! This user requires Key Connector to manage their encryption. Removing this user from your organization will permanently disable their account. This action cannot be undone. Do you want to proceed?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Deactivated user $ID$.",
+  "removeUserIdAccess": {
+    "message": "Remove $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Activated user $ID$.",
+  "revokedUserId": {
+    "message": "Revoked organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Deactivate user $ID$?",
+  "restoredUserId": {
+    "message": "Restored organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Activate user $ID$?",
+  "revokeUserId": {
+    "message": "Revoke $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "Disabled"
   },
-  "deactivated": {
-    "message": "Deactivated"
+  "revoked": {
+    "message": "Revoked"
   },
   "sendLink": {
     "message": "Send link",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "Are you sure you want to remove the following users? The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "deactivateUsersWarning": {
-    "message": "Are you sure you want to deactivate the following members? They will no longer have access to the organization, but will still have access to their individual vaults. The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "removeOrgUsersConfirmation": {
+    "message": "When member(s) are removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "activateUsersWarning": {
-    "message": "Are you sure you want to activate the following members, granting them access to the organization? The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "revokeUsersWarning": {
+    "message": "When member(s) are revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
   "theme": {
     "message": "Theme"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "Removed successfully"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Deactivated successfully"
+  "bulkRevokedMessage": {
+    "message": "Revoked organization access successfully"
   },
-  "bulkActivatedMessage": {
-    "message": "Activated successfully"
+  "bulkRestoredMessage": {
+    "message": "Restored organization access successfully"
   },
   "bulkFilteredMessage": {
     "message": "Excluded, not applicable for this action."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "Remove Users"
   },
-  "deactivateUsers": {
-    "message": "Deactivate Users"
+  "revokeUsers": {
+    "message": "Revoke Users"
   },
-  "activateUsers": {
-    "message": "Activate Users"
+  "restoreUsers": {
+    "message": "Restore Users"
   },
   "error": {
     "message": "Error"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Sponsorship Created"
   },
-  "revoke": {
-    "message": "Revoke"
-  },
   "emailSent": {
     "message": "Email Sent"
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "SCIM Provisioning",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Enable SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Set up your preferred identity provider by configuring the URL and SCIM API Key",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "This API key has access to manage users within your organization. It should be kept secret."
+  },
+  "copyScimKey": {
+    "message": "Copy the SCIM API Key to your clipboard",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Rotate the SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Are you sure you want to rotate the SCIM API Key? The current key will no longer work for any existing integrations.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Rotate Key"
+  },
+  "scimApiKey": {
+    "message": "SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Copy the SCIM endpoint URL to your clipboard",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "SCIM URL",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "The SCIM API Key has been successfully rotated",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "SCIM settings have been saved successfully",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Input is required."
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "On"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/ca/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "El vostre compte s'ha creat correctament. Ara ja podeu entrar."
   },
+  "trialAccountCreated": {
+    "message": "Compte creat amb èxit."
+  },
   "masterPassSent": {
     "message": "Hem enviat un correu electrònic amb la vostra contrasenya mestra."
   },
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "Habilitat"
   },
-  "activate": {
-    "message": "Activa"
+  "restoreAccess": {
+    "message": "Restaura l'accés"
   },
   "premium": {
     "message": "Premium",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "Inhabilita"
   },
-  "deactivate": {
-    "message": "Desactiva"
+  "revokeAccess": {
+    "message": "Revoca l'accés"
   },
   "twoStepLoginProviderEnabled": {
     "message": "Aquest proveïdor d'inici de sessió en dues passes està habilitat al vostre compte."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "Facturació"
   },
+  "billingPlanLabel": {
+    "message": "Pla de facturació"
+  },
+  "paymentType": {
+    "message": "Tipus de pagament"
+  },
   "accountCredit": {
     "message": "Compte de crèdit",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "any"
   },
+  "yr": {
+    "message": "any"
+  },
   "month": {
     "message": "mes"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Informació de facturació"
   },
+  "billingTrialSubLabel": {
+    "message": "El vostre mètode de pagament no es cobrarà durant la prova gratuïta de 7 dies."
+  },
   "creditCard": {
     "message": "Targeta de crèdit"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Gràcies per registrar-te a Bitwarden per $PLAN$!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "La vostra prova gratuïta de $PLAN$ de 7 dies es convertirà en una subscripció de pagament al cap de 7 dies.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "Hem enviat un correu electrònic de confirmació al correu electrònic de facturació del vostre equip a "
+  },
   "monthly": {
     "message": "Mensual"
   },
   "annually": {
     "message": "Annual"
   },
+  "annual": {
+    "message": "Anual"
+  },
   "basePrice": {
     "message": "Preu base"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "Esteu segur que voleu suprimir aquest usuari?"
   },
-  "deactivateUserConfirmation": {
-    "message": "El membre ja no tindrà accés a l'organització, però encara tindrà accés a la caixa forta individual."
+  "removeOrgUserConfirmation": {
+    "message": "Quan s'elimina un membre, ja no té accés a les dades de l'organització i aquesta acció és irreversible. Per tornar a afegir el membre a l'organització, cal convidar-lo i incorporar-lo de nou."
   },
-  "activateUserConfirmation": {
-    "message": "Confirmeu que voleu activar aquest usuari per concedir-li accés a l'organització?"
+  "revokeUserConfirmation": {
+    "message": "Quan un membre és revocat, ja no té accés a les dades de l'organització. Per restaurar ràpidament l'accés dels membres, aneu a la pestanya Revocat."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Advertència! Aquest usuari requereix un connector clau per gestionar el seu xifrat. La supressió d'aquest usuari des de la vostra organització desactivarà permanentment el seu compte. Aquesta acció no es pot desfer. Voleu continuar?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Desactivat usuari $ID$.",
+  "removeUserIdAccess": {
+    "message": "Suprimeix l'accés $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Activat usuari $ID$.",
+  "revokedUserId": {
+    "message": "S'ha revocat l'accés a l'organització per $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Vols desactivar l'usuari $ID$?",
+  "restoredUserId": {
+    "message": "S'ha revstaurat l'accés a l'organització per $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Vols activar l'usuari $ID$?",
+  "revokeUserId": {
+    "message": "S'ha revocat l'accés per $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3219,7 +3258,7 @@
     "message": "L'organització està inhabilitada."
   },
   "disabledOrganizationFilterError": {
-    "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+    "message": "No es pot accedir als elements de les organitzacions inhabilitades. Poseu-vos en contacte amb el propietari de la vostra organització per obtenir ajuda."
   },
   "licenseIsExpired": {
     "message": "Llicència caducada."
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "Inhabilitat"
   },
-  "deactivated": {
-    "message": "Desactivat"
+  "revoked": {
+    "message": "Revocat"
   },
   "sendLink": {
     "message": "Enllaç Send",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "Esteu segur que voleu eliminar els usuaris següents? El procés pot tardar uns segons a completar-se i no es pot interrompre ni cancel·lar."
   },
-  "deactivateUsersWarning": {
-    "message": "Esteu segur que voleu desactivar els membres següents? Ja no tindran accés a l'organització, però encara tindran accés a les seues caixes fortes individuals. El procés pot tardar uns quants segons a completar-se i no es pot interrompre ni cancel·lar."
+  "removeOrgUsersConfirmation": {
+    "message": "Quan se suprimeixen els membres, ja no tenen accés a les dades de l'organització i aquesta acció és irreversible. Per tornar a afegir el membre a l'organització, cal convidar-lo i incorporar-lo de nou. El procés pot tardar uns quants segons a completar-se i no es pot interrompre ni cancel·lar."
   },
-  "activateUsersWarning": {
-    "message": "Esteu segur que voleu activar els membres següents, donant-los accés a l'organització? El procés pot tardaruns quants segons a completar-se i no es pot interrompre ni cancel·lar."
+  "revokeUsersWarning": {
+    "message": "Quan els membres són revocats, ja no tenen accés a les dades de l'organització. Per restaurar ràpidament l'accés dels membres, aneu a la pestanya Revocat. El procés pot tardar uns quants segons a completar-se i no es pot interrompre ni cancel·lar."
   },
   "theme": {
     "message": "Tema"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "Suprimit correctament"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Desactivat correctament"
+  "bulkRevokedMessage": {
+    "message": "S'ha revocat l'accés a l'organització correctament"
   },
-  "bulkActivatedMessage": {
-    "message": "Activat correctament"
+  "bulkRestoredMessage": {
+    "message": "S'ha restaurat l'accés a l'organització correctament"
   },
   "bulkFilteredMessage": {
     "message": "Exclòs, no aplicable per a aquesta acció."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "Suprimeix usuaris"
   },
-  "deactivateUsers": {
-    "message": "Desactiva usuaris"
+  "revokeUsers": {
+    "message": "Revoca usuaris"
   },
-  "activateUsers": {
-    "message": "Activa usuaris"
+  "restoreUsers": {
+    "message": "Restaura usuaris"
   },
   "error": {
     "message": "Error"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "S'ha creat un patrocini"
   },
-  "revoke": {
-    "message": "Revoca"
-  },
   "emailSent": {
     "message": "Correu electrònic enviat"
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "Aprovisionament SCIM",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Proporcioneu automàticament usuaris i grups amb el vostre proveïdor d'identitat preferit mitjançant el subministrament SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Habilita SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Configureu el vostre proveïdor d'identitat preferit configurant l'URL i la clau de l'API SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "Aquesta clau d'API té accés per gestionar els usuaris de la vostra organització. S'ha de mantenir en secret."
+  },
+  "copyScimKey": {
+    "message": "Copieu la clau de l'API SCIM al porta-retalls",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Gira la clau de l'API SCIM",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Esteu segur que voleu girar la clau de l'API SCIM? La clau actual ja no funcionarà per a cap integració existent.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Gira la clau"
+  },
+  "scimApiKey": {
+    "message": "Gira la clau de l'API SCIM",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Copia l'URL del punt final d'SCIM al porta-retalls",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "URL d'SCIM",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "La clau de l'API SCIM s'ha girat correctament",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "La configuració de SCIM s'ha guardat correctament",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Es requereix una entrada."
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "Activat"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/cs/messages.json

@@ -573,7 +573,7 @@
     "message": "Vytvořit účet"
   },
   "startTrial": {
-    "message": "Start Trial"
+    "message": "Zahájit zkušební verzi"
   },
   "logIn": {
     "message": "Přihlásit se"
@@ -597,7 +597,7 @@
     "message": "Hlavní heslo je heslo, které používáte k přístupu do vašeho trezoru. Je velmi důležité, abyste jej nezapomněli. Neexistuje totiž žádný způsob, jak heslo obnovit v případě, že jste na něj zapomněli."
   },
   "masterPassImportant": {
-    "message": "Master passwords cannot be recovered if you forget it!"
+    "message": "Hlavní hesla nelze obnovit, pokud je zapomenete!"
   },
   "masterPassHintDesc": {
     "message": "Nápověda k hlavnímu heslu vám pomůže zapamatovat si heslo, pokud ho zapomenete."
@@ -630,13 +630,13 @@
     "message": "Neplatná e-mailová adresa."
   },
   "masterPasswordRequired": {
-    "message": "Master password is required."
+    "message": "Hlavní heslo je povinné."
   },
   "confirmMasterPasswordRequired": {
-    "message": "Master password retype is required."
+    "message": "Druhé zadání hlavního hesla je povinné."
   },
   "masterPasswordMinLength": {
-    "message": "Master password must be at least 8 characters long."
+    "message": "Hlavní heslo musí obsahovat alespoň 8 znaků."
   },
   "masterPassDoesntMatch": {
     "message": "Potvrzení hlavního hesla se neshoduje."
@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "Váš účet byl vytvořen! Můžete se přihlásit."
   },
+  "trialAccountCreated": {
+    "message": "Account created successfully."
+  },
   "masterPassSent": {
     "message": "Poslali jsme vám e-mail s nápovědou k hlavnímu heslu."
   },
@@ -1161,10 +1164,10 @@
     "message": "Změňte jazyk používaný ve webovém trezoru."
   },
   "enableFavicon": {
-    "message": "Show website icons"
+    "message": "Zobrazit ikony webových stránek"
   },
   "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+    "message": "Zobrazit rozeznatelný obrázek vedle každého přihlášení."
   },
   "enableGravatars": {
     "message": "Povolit službu Gravatar",
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "Povoleno"
   },
-  "activate": {
-    "message": "Activate"
+  "restoreAccess": {
+    "message": "Restore Access"
   },
   "premium": {
     "message": "Prémium",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "Zakázat"
   },
-  "deactivate": {
-    "message": "Deactivate"
+  "revokeAccess": {
+    "message": "Revoke Access"
   },
   "twoStepLoginProviderEnabled": {
     "message": "Tento poskytovatel dvoufázového přihlášení byl povolen."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "Fakturace"
   },
+  "billingPlanLabel": {
+    "message": "Billing Plan"
+  },
+  "paymentType": {
+    "message": "Payment Type"
+  },
   "accountCredit": {
     "message": "Kredit na účtu",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "rok"
   },
+  "yr": {
+    "message": "yr"
+  },
   "month": {
     "message": "měsíc"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Fakturační údaje"
   },
+  "billingTrialSubLabel": {
+    "message": "Your payment method will not be charged during the 7 day free trial."
+  },
   "creditCard": {
     "message": "Kreditní karta"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Thanks for signing up for Bitwarden for $PLAN$!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "Your $PLAN$ 7 day free trial will be converted to a paid subscription after 7 days.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "We've sent a confirmation email to your team's billing email at "
+  },
   "monthly": {
     "message": "Měsíčně"
   },
   "annually": {
     "message": "Ročně"
   },
+  "annual": {
+    "message": "Annual"
+  },
   "basePrice": {
     "message": "Základní cena"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "Opravdu chcete tohoto uživatele smazat?"
   },
-  "deactivateUserConfirmation": {
-    "message": "The member will no longer have access to the organization, but will still have access to their individual vault."
+  "removeOrgUserConfirmation": {
+    "message": "When a member is removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again."
   },
-  "activateUserConfirmation": {
-    "message": "Are you sure you want to activate this user, granting them access to the organization?"
+  "revokeUserConfirmation": {
+    "message": "When a member is revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Warning! This user requires Key Connector to manage their encryption. Removing this user from your organization will permanently disable their account. This action cannot be undone. Do you want to proceed?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Deactivated user $ID$.",
+  "removeUserIdAccess": {
+    "message": "Remove $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Activated user $ID$.",
+  "revokedUserId": {
+    "message": "Revoked organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Deactivate user $ID$?",
+  "restoredUserId": {
+    "message": "Restored organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Activate user $ID$?",
+  "revokeUserId": {
+    "message": "Revoke $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3169,7 +3208,7 @@
     "message": "Zaškrtnutím tohoto políčka souhlasím s následujícím:"
   },
   "acceptPoliciesRequired": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "Podmínky použití a zásady ochrany osobních údajů nebyly odsouhlaseny."
   },
   "termsOfService": {
     "message": "Podmínky služby"
@@ -3219,7 +3258,7 @@
     "message": "Organizace je zakázána."
   },
   "disabledOrganizationFilterError": {
-    "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+    "message": "Položky v zablokovaných organizacích nejsou dostupné. Pro pomoc kontaktujte majitele organizace."
   },
   "licenseIsExpired": {
     "message": "Licence vypršela."
@@ -3346,13 +3385,13 @@
     "message": "Duplikovat"
   },
   "masterPassPolicyTitle": {
-    "message": "Master password requirements"
+    "message": "Požadavky na hlavní heslo"
   },
   "masterPassPolicyDesc": {
     "message": "Nastavte minimální požadavky pro sílu hlavního hesla."
   },
   "twoStepLoginPolicyTitle": {
-    "message": "Require two-step login"
+    "message": "Požadavek dvoufázového přihlášení"
   },
   "twoStepLoginPolicyDesc": {
     "message": "Požadovat po uživatelích nastavení dvoufázového přihlášení pro jejich osobní účty."
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "Zakázáno"
   },
-  "deactivated": {
-    "message": "Deactivated"
+  "revoked": {
+    "message": "Revoked"
   },
   "sendLink": {
     "message": "Odkaz tohoto Send",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "Opravdu chcete odebrat následující uživatele? Proces může trvat několik sekund a nelze jej přerušit ani zrušit."
   },
-  "deactivateUsersWarning": {
-    "message": "Are you sure you want to deactivate the following members? They will no longer have access to the organization, but will still have access to their individual vaults. The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "removeOrgUsersConfirmation": {
+    "message": "When member(s) are removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "activateUsersWarning": {
-    "message": "Are you sure you want to activate the following members, granting them access to the organization? The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "revokeUsersWarning": {
+    "message": "When member(s) are revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
   "theme": {
     "message": "Motiv"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "Úspěšně odstraněno"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Deactivated successfully"
+  "bulkRevokedMessage": {
+    "message": "Revoked organization access successfully"
   },
-  "bulkActivatedMessage": {
-    "message": "Activated successfully"
+  "bulkRestoredMessage": {
+    "message": "Restored organization access successfully"
   },
   "bulkFilteredMessage": {
     "message": "Vyloučené, neplatí pro tuto akci."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "Odebrat uživatele"
   },
-  "deactivateUsers": {
-    "message": "Deactivate Users"
+  "revokeUsers": {
+    "message": "Revoke Users"
   },
-  "activateUsers": {
-    "message": "Activate Users"
+  "restoreUsers": {
+    "message": "Restore Users"
   },
   "error": {
     "message": "Chyba"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Sponsorship Created"
   },
-  "revoke": {
-    "message": "Revoke"
-  },
   "emailSent": {
     "message": "Email Sent"
   },
@@ -5184,14 +5220,68 @@
       }
     }
   },
+  "scim": {
+    "message": "Poskytování SCIM",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Automaticky zajišťuje uživatelům a skupinám vašeho preferovaného poskytovatele identity prostřednictvím SCIM poskytování",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Aktivovat SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Nastavte svého preferovaného poskytovatele identity nastavením URL a SCIM API klíče",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "Tento klíč API má přístup ke správě uživatelů ve vaší organizaci. Měl by být zachován v tajnosti."
+  },
+  "copyScimKey": {
+    "message": "Zkopírujte SCIM API klíč do schránky",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Vyměňte SCIM API klíč",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Opravdu chcete změnit SCIM API klíč? Aktuální klíč již nebude fungovat pro žádné existující integrace.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Změnit klíč"
+  },
+  "scimApiKey": {
+    "message": "SCIM API klíč",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Zkopírujte URL adresu SCIM koncového bodu do schránky",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "SCIM URL",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "SCIM API klíč byl úspěšně změněn",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "Nastavení SCIM bylo úspěšně uloženo",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
-    "message": "Input is required."
+    "message": "Položka nesmí být prázdná."
   },
   "inputEmail": {
-    "message": "Input is not an email-address."
+    "message": "Neplatná e-mailová adresa."
   },
   "inputMinLength": {
-    "message": "Input must be at least $COUNT$ characters long.",
+    "message": "Vstup musí mít alespoň $COUNT$ znaků.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -5200,7 +5290,7 @@
     }
   },
   "fieldsNeedAttention": {
-    "message": "$COUNT$ field(s) above need your attention.",
+    "message": "$COUNT$ výše uvedených polí vyžaduje vaši pozornost.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -5209,9 +5299,12 @@
     }
   },
   "turnOn": {
-    "message": "Turn on"
+    "message": "Zapnout"
   },
   "on": {
-    "message": "On"
+    "message": "Zapnuto"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/da/messages.json

@@ -597,7 +597,7 @@
     "message": "Hovedadgangskoden er den adgangskode, du bruger til at få adgang til din boks. Det er meget vigtigt, at du ikke glemmer din hovedadgangskode. Der er ingen måde hvorpå koden kan genoprettes, i tilfælde af at du glemmer den."
   },
   "masterPassImportant": {
-    "message": "Hovedadgangskoder kan ikke gendannes, hvis de glemmes!"
+    "message": "Hovedadgangskoder kan ikke gendannes, hvis du glemmer dem!"
   },
   "masterPassHintDesc": {
     "message": "Et tip til hovedadgangskoden kan hjælpe dig med at huske din adgangskode, hvis du glemmer den."
@@ -636,7 +636,7 @@
     "message": "Hovedadgangskode kræves angivet igen."
   },
   "masterPasswordMinLength": {
-    "message": "Hovedadgangskode skal udgøre min. 8 tegn."
+    "message": "Hovedadgangskode skal være på mindst 8 tegn."
   },
   "masterPassDoesntMatch": {
     "message": "De to hovedadgangskoder matcher ikke."
@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "Din nye konto er oprettet! Du kan nu logge ind."
   },
+  "trialAccountCreated": {
+    "message": "Konto oprettet."
+  },
   "masterPassSent": {
     "message": "Vi har sendt dig en e-mail med dit hovedadgangskodetip."
   },
@@ -1076,7 +1079,7 @@
     "message": "Slet konto"
   },
   "deleteAccountDesc": {
-    "message": "Fortsæt nedenfor for at slette din konto og alle tilknyttede data."
+    "message": "Fortsæt nedenfor for at slette din konto og alle boks-data."
   },
   "deleteAccountWarning": {
     "message": "Sletning af din konto er permanent. Det kan ikke fortrydes."
@@ -1085,7 +1088,7 @@
     "message": "Konto slettet"
   },
   "accountDeletedDesc": {
-    "message": "Din konto er blevet lukket, og alle tilknyttede data er blevet slettet."
+    "message": "Din Bitwarden-konto og boks-data er blevet slettet permanent."
   },
   "myAccount": {
     "message": "Min konto"
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "Aktiveret"
   },
-  "activate": {
-    "message": "Aktivér"
+  "restoreAccess": {
+    "message": "Gendan adgang"
   },
   "premium": {
     "message": "Premium",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "Deaktivér"
   },
-  "deactivate": {
-    "message": "Deaktivér"
+  "revokeAccess": {
+    "message": "Fjern Adgang"
   },
   "twoStepLoginProviderEnabled": {
     "message": "Denne to-trins-login udbyder er aktiveret på din konto."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "Fakturering"
   },
+  "billingPlanLabel": {
+    "message": "Faktureringsabonnement"
+  },
+  "paymentType": {
+    "message": "Betalingstype"
+  },
   "accountCredit": {
     "message": "Kontoindestående",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "år"
   },
+  "yr": {
+    "message": "år"
+  },
   "month": {
     "message": "måned"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Faktureringsoplysninger"
   },
+  "billingTrialSubLabel": {
+    "message": "Betaling opkræves ikke via valgte betalingsmetode under den 7 dages gratis prøveperiode."
+  },
   "creditCard": {
     "message": "Betalingskort"
   },
@@ -2068,7 +2083,7 @@
     "message": "Til virksomheder og andre organisationer med teams."
   },
   "planNameEnterprise": {
-    "message": "Erhverv"
+    "message": "Virksomhed"
   },
   "planDescEnterprise": {
     "message": "Til virksomheder og andre store organisationer."
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Tak for tilmeldingen til Bitwarden for $PLAN$!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "Når den 7-dages gratis prøveperiode på $PLAN$ udløber, konverteres den til et betalt abonnement.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "Vi har sendt en bekræftelses-email til dit teams faktureringsadresse på "
+  },
   "monthly": {
     "message": "Månedlig"
   },
   "annually": {
     "message": "Årlig"
   },
+  "annual": {
+    "message": "Årligt"
+  },
   "basePrice": {
     "message": "Grundpris"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "Er du sikker på, at du vil fjerne denne bruger?"
   },
-  "deactivateUserConfirmation": {
-    "message": "Medlemmet vil ikke længere have adgang til organisationen, men vil stadig have adgang til sin egen boks."
+  "removeOrgUserConfirmation": {
+    "message": "Når et medlem er fjernet, har vedkommende ikke længere adgang til organisationsdata, og denne handling er irreversibel. For at føje medlemmet til organisationen igen, skal vedkommende inviteres og onboardes igen."
   },
-  "activateUserConfirmation": {
-    "message": "Er du sikker på, at du vil aktivere denne bruger og give vedkommende adgang til organisationen?"
+  "revokeUserConfirmation": {
+    "message": "Når et medlems rettigheder tilbagekaldes, har vedkommende ikke længere adgang til organisationsdata. For hurtigt at genoprette medlemsadgang, så gå til fanen Tilbagekaldt."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Advarsel! Denne bruger behøver Key Connector til krypteringshåndtering. Fjernes brugeren fra din organisation, deaktiveres vedkommendes konto permanent. Denne handling kan ikke fortrydes. Vil du fortsætte?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Deaktiveret bruger $ID$.",
+  "removeUserIdAccess": {
+    "message": "Fjern $ID$s adgang",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Aktiveret bruger $ID$.",
+  "revokedUserId": {
+    "message": "Tilbagekaldt organisationsadgang for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Deaktivér bruger $ID$?",
+  "restoredUserId": {
+    "message": "Genoprettet organisationsadgang for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Aktivér bruger $ID$?",
+  "revokeUserId": {
+    "message": "Fjern $ID$s adgang",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3169,7 +3208,7 @@
     "message": "Ved at markere dette felt accepterer du følgende:"
   },
   "acceptPoliciesRequired": {
-    "message": "Tjenestevilkår og Fortrolighedspolitik er ikke blevet accepteret."
+    "message": "Tjenestevilkår og fortrolighedspolitik er ikke blevet accepteret."
   },
   "termsOfService": {
     "message": "Servicevilkår"
@@ -3219,7 +3258,7 @@
     "message": "Organisationen er deaktiveret."
   },
   "disabledOrganizationFilterError": {
-    "message": "Elementer i deaktiverede organisationer kan ikke tilgås. Kontakt organisationsejeren for hjælp."
+    "message": "Elementer i deaktiverede organisationer kan ikke tilgås. Kontakt din organisationsejer for at få hjælp."
   },
   "licenseIsExpired": {
     "message": "Licensen er udløbet."
@@ -3346,25 +3385,25 @@
     "message": "Klon"
   },
   "masterPassPolicyTitle": {
-    "message": "Hovedadgangskodekrav"
+    "message": "Krav til hovedadgangskode"
   },
   "masterPassPolicyDesc": {
-    "message": "Angiv minimumskrav til styrken af hovedadgangskoden."
+    "message": "Angiv krav til styrken af hovedadgangskode."
   },
   "twoStepLoginPolicyTitle": {
     "message": "Kræv totrins-login"
   },
   "twoStepLoginPolicyDesc": {
-    "message": "Kræv at brugerne konfigurerer to-trins-login på deres personlige konti."
+    "message": "Kræv at medlemmer opsætter totrins-login."
   },
   "twoStepLoginPolicyWarning": {
-    "message": "Organisationsmedlemmer, der ikke er ejere eller administratorer og ikke har to-trins login aktiveret på deres personlige konto, fjernes fra organisationen og modtager en e-mail med besked om ændringen."
+    "message": "Organisationsmedlemmer, som ikke er ejere eller administratorer og ikke har totrins-login aktiveret på deres konto, vil blive fjernet fra organisationen og vil modtage en e-mail med besked om ændringen."
   },
   "twoStepLoginPolicyUserWarning": {
     "message": "Du er medlem af en organisation, der kræver at to-trins login er aktiveret på din brugerkonto. Hvis du deaktiverer alle to-trins login-udbydere, fjernes du automatisk fra disse organisationer."
   },
   "passwordGeneratorPolicyDesc": {
-    "message": "Angiv minimumskrav til konfiguration af adgangskodegenerator."
+    "message": "Angiv krav til adgangskodegenerator."
   },
   "passwordGeneratorPolicyInEffect": {
     "message": "Én eller flere organisationspolitikker påvirker dine generatorindstillinger."
@@ -3585,7 +3624,7 @@
     "message": "Enkel organisation"
   },
   "singleOrgDesc": {
-    "message": "Begræns brugere fra at kunne deltage i andre organisationer."
+    "message": "Begræns medlemmer fra at blive medlem af andre organisationer."
   },
   "singleOrgBlockCreateMessage": {
     "message": "Din nuværende organisation har en politik, der ikke tillader dig at deltage i mere end en organisation. Kontakt din organisations administratorer, eller tilmeld dig fra en anden Bitwarden-konto."
@@ -3594,16 +3633,16 @@
     "message": "Organisationsmedlemmer, der ikke er ejere eller administratorer og allerede er medlem af en anden organisation, fjernes fra din organisation."
   },
   "requireSso": {
-    "message": "Single Sign-On autentificering"
+    "message": "Kræv single sign-on-godkendelse"
   },
   "requireSsoPolicyDesc": {
-    "message": "Kræv at brugerne logger ind med Virksomheds Single Sign-On-metoden."
+    "message": "Kræv at medlemmer logger på med virksomheds Single Sign-On-metoden."
   },
   "prerequisite": {
     "message": "Forudsætning"
   },
   "requireSsoPolicyReq": {
-    "message": "Enkel organisations virksomhedspolitikken skal aktiveres, før denne politik aktiveres."
+    "message": "Enkel organisation virksomhedspolitikken skal være aktiveret, før denne politik aktiveres."
   },
   "requireSsoPolicyReqError": {
     "message": "Enkelt organisationspolitik er ikke aktiveret."
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "Deaktiveret"
   },
-  "deactivated": {
-    "message": "Deaktiveret"
+  "revoked": {
+    "message": "Tilbagekaldt"
   },
   "sendLink": {
     "message": "Send link",
@@ -3898,10 +3937,10 @@
     }
   },
   "personalOwnership": {
-    "message": "Personligt ejerskab"
+    "message": "Fjern individuel boks"
   },
   "personalOwnershipPolicyDesc": {
-    "message": "Kræv at brugere gemmer boks-elementer til en organisation ved at fjerne den personlige ejerskabsmulighed."
+    "message": "Kræv at medlemmer gemmer elementer i en organisation ved at fjerne muligheden for individuelle bokse."
   },
   "personalOwnershipExemption": {
     "message": "Organisationsejere og administratorer er undtaget fra denne politik."
@@ -3910,10 +3949,10 @@
     "message": "Grundet en virksomhedspolitik kan du ikke gemme emner i din personlige boks. Skift ejerskabsindstillingen til en organisation, og vælg fra de tilgængelige samlinger."
   },
   "disableSend": {
-    "message": "Deaktivér Send"
+    "message": "Fjern Send"
   },
   "disableSendPolicyDesc": {
-    "message": "Tillad ikke brugere at oprette eller redigere en Bitwarden Send. Sletning af en eksisterende Send er stadig tilladt.",
+    "message": "Tillad ikke medlemmer at oprette eller redigere Sends.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "disableSendExemption": {
@@ -3939,7 +3978,7 @@
     "message": "Organisationsbrugere, som kan håndtere organisationens politikker, er undtaget fra denne politiks håndhævelse."
   },
   "disableHideEmail": {
-    "message": "Tillad ikke brugere at skjule deres e-mailadresse for modtagere når en Send oprettes eller redigeres.",
+    "message": "Vis altid medlemmets e-mailadresse med modtagere, når Sends oprettes eller redigeres.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendOptionsPolicyInEffect": {
@@ -4238,7 +4277,7 @@
     "message": "Nulstil hovedadgangskode"
   },
   "resetPasswordPolicyDescription": {
-    "message": "Tillad administratorer i organisationen at nulstille organisationsbrugeres hovedadgangskode."
+    "message": "Tillad administratorer at nulstille hovedadgangskoder for medlemmer."
   },
   "resetPasswordPolicyWarning": {
     "message": "Brugere i organisationen skal selvindrullere eller være auto-indrulleret, før administratorer kan nulstille deres hovedadgangskode."
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "Er du sikker på, at du vil fjerne følgende brugere? Processen kan tage et par sekunder at fuldføre og kan ikke afbrydes eller annulleres."
   },
-  "deactivateUsersWarning": {
-    "message": "Er du sikker på, at du vil deaktivere følgende medlemmer? De vil ikke længere have adgang til organisationen, men vil stadig have adgang til deres egne bokse. Processen kan tage nogle sekunder at gennemføre, og den kan ikke afbrydes eller annulleres."
+  "removeOrgUsersConfirmation": {
+    "message": "Når medlemmer fjernes, har de ikke længere adgang til organisationsdata, og denne handling er irreversibel. For at gentilføje medlemmer til organisationen, skal de inviteres og onboardes igen. Processen kan tage et par sekunder at udføre og kan ikke afbrydes eller annulleres."
   },
-  "activateUsersWarning": {
-    "message": "Er du sikker på, at du vil aktivere følgende medlemmer og give dem adgang til organisationen? Processen kan tage nogle sekunder at gennemføre og kan ikke afbrydes eller annulleres."
+  "revokeUsersWarning": {
+    "message": "Når medlemmers adgang tilbagekaldes, har de ikke længere adgang til organisationsdata. For hurtigt at genoprette medlemsadgang, så gå til fanen Tilbagekaldt. Processen kan tage et par sekunder at udføre og kan ikke afbrydes."
   },
   "theme": {
     "message": "Tema"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "Fjernet med succes"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Deaktivering udført"
+  "bulkRevokedMessage": {
+    "message": "Organisationsadgang tilbagekaldt"
   },
-  "bulkActivatedMessage": {
-    "message": "Aktivering udført"
+  "bulkRestoredMessage": {
+    "message": "Organisationsadgang genetableret"
   },
   "bulkFilteredMessage": {
     "message": "Udelukket, ikke anvendeligt til denne handling."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "Fjern brugere"
   },
-  "deactivateUsers": {
-    "message": "Deaktivere brugere"
+  "revokeUsers": {
+    "message": "Tilbagekald brugeradgang"
   },
-  "activateUsers": {
-    "message": "Aktivere brugere"
+  "restoreUsers": {
+    "message": "Genetablér brugeradgang"
   },
   "error": {
     "message": "Fejl"
@@ -4485,7 +4524,7 @@
     "message": "Boks-timeout"
   },
   "maximumVaultTimeoutDesc": {
-    "message": "Opsæt en maksimal boks-timeout for alle brugere."
+    "message": "Opsæt en maksimal boks-timeout for medlemmer."
   },
   "maximumVaultTimeoutLabel": {
     "message": "Maksimal boks-timeout"
@@ -4525,10 +4564,10 @@
     "message": "Boks-timeout er ikke inden for det tilladte interval."
   },
   "disablePersonalVaultExport": {
-    "message": "Deaktivér eksport af personlig boks"
+    "message": "Deaktivér individuel bokseksport"
   },
   "disablePersonalVaultExportDesc": {
-    "message": "Forbyder brugere at eksportere deres private boksdata."
+    "message": "Tillad ikke medlemmer at eksportere deres individuelle boksdata."
   },
   "vaultExportDisabled": {
     "message": "Bokseksport deaktiveret"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Sponsorat oprettet"
   },
-  "revoke": {
-    "message": "Tilbagekald"
-  },
   "emailSent": {
     "message": "E-mail sendt"
   },
@@ -4819,11 +4855,11 @@
     "message": "Når den er indstillet, vil din konfiguration blive gemt, og medlemmer vil være i stand til at autentificere ved hjælp af deres identitetsudbyder-akkreditiver."
   },
   "ssoPolicyHelpStart": {
-    "message": "Aktivér",
+    "message": "Brug",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Use the require single-sign-on authentication policy to require all members to log in with SSO.'"
   },
   "ssoPolicyHelpLink": {
-    "message": "SSO-godkendelsespolitik",
+    "message": "kræv enkelt-logon-godkendelsespolitik",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Use the require single-sign-on authentication policy to require all members to log in with SSO.'"
   },
   "ssoPolicyHelpEnd": {
@@ -4831,7 +4867,7 @@
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Use the require single-sign-on authentication policy to require all members to log in with SSO.'"
   },
   "ssoPolicyHelpKeyConnector": {
-    "message": "SSO-godkendelse og Enkel organisation-politikker er påkrævet for at konfigurere Key Connector-dekryptering."
+    "message": "Kræv SSO-godkendelse og enkeltorganisationspolitikker er påkrævet for at konfigurere Key Connector-dekryptering."
   },
   "memberDecryptionOption": {
     "message": "Medlemsdekrypteringsindstillinger"
@@ -5184,14 +5220,68 @@
       }
     }
   },
+  "scim": {
+    "message": "SCIM-provisionering",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Opret automatisk brugere og grupper med din foretrukne identitetsudbyder via SCIM-provisionering",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Aktivér SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Opsæt din foretrukne identitetsudbyder ved at konfigurere URL'en og SCIM API-nøglen",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "Denne API-nøgle har adgang til at håndtere organisationsbrugere. Den bør holdes hemmelig."
+  },
+  "copyScimKey": {
+    "message": "Kopiér SCIM API-nøglen til udklipsholderen",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Rotér SCIM API-nøglen",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Er du sikker på, at du vil rotere SCIM API-nøglen? Den nuværende nøgle vil ikke længere fungere for eksisterende integrationer.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Rotér nøgle"
+  },
+  "scimApiKey": {
+    "message": "SCIM API-nøgle",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Kopiér SCIM-slutpunktets URL til udklipsholderen",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "SCIM URL",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "SCIM API-nøglen er blevet roteret",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "SCIM-indstillingerne er blevet gemt",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Input obligatorisk."
   },
   "inputEmail": {
-    "message": "Input er ikke en gyldig e-mailadresse."
+    "message": "Input er ikke en e-mailadresse."
   },
   "inputMinLength": {
-    "message": "Input skal udgøre min. $COUNT$ tegn.",
+    "message": "Input skal være mindst $COUNT$ tegn langt.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -5200,7 +5290,7 @@
     }
   },
   "fieldsNeedAttention": {
-    "message": "$COUNT$-felt(er) ovenfor kræver din opmærksomhed.",
+    "message": "$COUNT$ felt(er) ovenfor kræver din opmærksomhed.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "Til"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/de/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "Ihr neues Konto wurde erstellt! Sie können sich jetzt anmelden."
   },
+  "trialAccountCreated": {
+    "message": "Konto wurde erfolgreich erstellt."
+  },
   "masterPassSent": {
     "message": "Wir haben Ihnen eine E-Mail mit dem Master-Passwort-Hinweis zu gesendet."
   },
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "Aktiviert"
   },
-  "activate": {
-    "message": "Aktivieren"
+  "restoreAccess": {
+    "message": "Zugriff wiederherstellen"
   },
   "premium": {
     "message": "Premium",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "Deaktivieren"
   },
-  "deactivate": {
-    "message": "Deaktivieren"
+  "revokeAccess": {
+    "message": "Zugriff widerrufen"
   },
   "twoStepLoginProviderEnabled": {
     "message": "Dieser Zwei-Faktor-Authentifizierungsanbieter ist für Ihr Konto aktiviert."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "Rechnung"
   },
+  "billingPlanLabel": {
+    "message": "Abrechnungsplan"
+  },
+  "paymentType": {
+    "message": "Zahlungsart"
+  },
   "accountCredit": {
     "message": "Kontoguthaben",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "Jahr"
   },
+  "yr": {
+    "message": "Jahr"
+  },
   "month": {
     "message": "Monat"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Informationen zur Abrechnung"
   },
+  "billingTrialSubLabel": {
+    "message": "Deine Zahlungsmethode wird während der kostenlosen 7-tägigen Testversion nicht belastet."
+  },
   "creditCard": {
     "message": "Kreditkarte"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Vielen Dank, dass du dich bei Bitwarden für $PLAN$ angemeldet hast!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "Deine kostenlose 7-tägige $PLAN$ Testversion wird nach 7 Tagen in ein kostenpflichtiges Abo umgewandelt.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "Wir haben eine Bestätigungs-E-Mail an die Rechnungs-E-Mail deines Teams gesendet an "
+  },
   "monthly": {
     "message": "Monatlich"
   },
   "annually": {
     "message": "Jährlich"
   },
+  "annual": {
+    "message": "Jährlich"
+  },
   "basePrice": {
     "message": "Grundpreis"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "Sind Sie sich sicher, dass Sie diesen Benutzer löschen wollen?"
   },
-  "deactivateUserConfirmation": {
-    "message": "Das Mitglied wird keinen Zugriff mehr zur Organisation haben, aber weiterhin Zugriff auf seinen persönlichen Tresor."
+  "removeOrgUserConfirmation": {
+    "message": "Wenn ein Mitglied entfernt wurde, hat es keinen Zugriff mehr auf die Organisationsdaten und diese Aktion ist unumkehrbar. Um das Mitglied wieder zur Organisation hinzuzufügen, muss es erneut eingeladen und eingebunden werden."
   },
-  "activateUserConfirmation": {
-    "message": "Bist du sicher, dass du diesen Benutzer aktivieren und ihm Zugriff zur Organisation gewähren möchtest?"
+  "revokeUserConfirmation": {
+    "message": "Wenn ein Mitglied widerrufen wurde, hat es keinen Zugriff mehr auf Organisationsdaten. Um den Mitgliederzugriff schnell wiederherzustellen, gehe zum Widerrufen-Tab."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Warnung! Dieser Benutzer benötigt Key Connector, um seine Verschlüsselung zu verwalten. Das Entfernen dieses Benutzers aus deiner Organisation wird sein Konto dauerhaft deaktivieren. Diese Aktion kann nicht rückgängig gemacht werden. Möchtest du fortfahren?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Benutzer $ID$ deaktiviert.",
+  "removeUserIdAccess": {
+    "message": "Zugriff für $ID$ entfernen",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Benutzer $ID$ aktiviert.",
+  "revokedUserId": {
+    "message": "Zugriff auf die Organisation für $ID$ widerrufen.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Benutzer $ID$ deaktivieren?",
+  "restoredUserId": {
+    "message": "Zugriff auf die Organisation für $ID$ wiederhergestellt.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Benutzer $ID$ aktivieren?",
+  "revokeUserId": {
+    "message": "Zugriff für $ID$ widerrufen",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "Deaktiviert"
   },
-  "deactivated": {
-    "message": "Deaktiviert"
+  "revoked": {
+    "message": "Widerrufen"
   },
   "sendLink": {
     "message": "Send Link",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "Bist du sicher, dass du die folgenden Benutzer entfernen möchtest? Der Prozess kann einige Sekunden dauern und kann nicht unterbrochen oder abgebrochen werden."
   },
-  "deactivateUsersWarning": {
-    "message": "Bist du sicher, dass du die folgenden Mitglieder deaktivieren möchtest? Sie werden keinen Zugang mehr zur Organisation haben, aber weiterhin Zugang auf ihre persönlichen Tresore haben. Der Prozess kann einige Sekunden dauern und kann nicht unterbrochen oder abgebrochen werden."
+  "removeOrgUsersConfirmation": {
+    "message": "Wenn Mitglieder entfernt werden, haben sie keinen Zugriff mehr auf Organisationsdaten und diese Aktion ist unumkehrbar. Um das Mitglied wieder zur Organisation hinzuzufügen, muss es erneut eingeladen und eingebunden werden. Der Prozess kann einige Sekunden dauern und kann nicht unterbrochen oder abgebrochen werden."
   },
-  "activateUsersWarning": {
-    "message": "Bist du sicher, dass du die folgenden Mitglieder aktivieren möchtest, um ihnen den Zugriff auf die Organisation zu gewähren? Der Prozess kann einige Sekunden dauern und kann nicht unterbrochen oder abgebrochen werden."
+  "revokeUsersWarning": {
+    "message": "Wenn Mitglieder widerrufen werden, haben sie keinen Zugriff mehr auf Organisationsdaten. Um den Mitgliederzugriff schnell wiederherzustellen, gehe zum Widerrufen-Tab. Der Prozess kann einige Sekunden dauern und kann nicht unterbrochen oder abgebrochen werden."
   },
   "theme": {
     "message": "Design"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "Erfolgreich entfernt"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Erfolgreich deaktiviert"
+  "bulkRevokedMessage": {
+    "message": "Zugriff auf die Organisation erfolgreich zurückgezogen"
   },
-  "bulkActivatedMessage": {
-    "message": "Erfolgreich aktiviert"
+  "bulkRestoredMessage": {
+    "message": "Zugriff auf die Organisation erfolgreich wiederhergestellt"
   },
   "bulkFilteredMessage": {
     "message": "Ausgeschlossen, nicht anwendbar für diese Aktion."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "Benutzer entfernen"
   },
-  "deactivateUsers": {
-    "message": "Benutzer deaktivieren"
+  "revokeUsers": {
+    "message": "Benutzer widerrufen"
   },
-  "activateUsers": {
-    "message": "Benutzer aktivieren"
+  "restoreUsers": {
+    "message": "Benutzer wiederherstellen"
   },
   "error": {
     "message": "Fehler"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Patenschaft erstellt"
   },
-  "revoke": {
-    "message": "Zurückziehen"
-  },
   "emailSent": {
     "message": "E-Mail gesendet"
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "SCIM-Bereitstellung",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Über SCIM-Bereitstellung automatisch Benutzer und Gruppen mit deinem bevorzugten Identitätsanbieter zur Verfügung stellen",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "SCIM aktivieren",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Richte deinen bevorzugten Identitätsanbieter ein, indem du die URL und den SCIM API-Schlüssel konfigurierst",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "Dieser API-Schlüssel hat Zugriff auf die Verwaltung von Benutzern innerhalb deiner Organisation. Er sollte geheim gehalten werden."
+  },
+  "copyScimKey": {
+    "message": "Den SCIM API-Schlüssel in deine Zwischenablage kopieren",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Den SCIM-API-Schlüssel erneuern",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Bist du sicher, dass du den SCIM API-Schlüssel erneuern möchtest? Der aktuelle Schlüssel wird für bestehende Integrationen nicht mehr funktionieren.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Schlüssel erneuern"
+  },
+  "scimApiKey": {
+    "message": "SCIM API-Schlüssel",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Kopiere die SCIM Endpunkt-URL in deine Zwischenablage",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "SCIM-URL",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "Der SCIM API-Schlüssel wurde erfolgreich erneuert",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "Alle SCIM Einstellungen wurden erfolgreich gespeichert",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Angabe ist erforderlich."
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "Ein"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/el/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "Ο λογαριασμός σας έχει δημιουργηθεί! Τώρα μπορείτε να συνδεθείτε."
   },
+  "trialAccountCreated": {
+    "message": "Account created successfully."
+  },
   "masterPassSent": {
     "message": "Σας στείλαμε ένα email με την υπόδειξη του κύριου κωδικού."
   },
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "Ενεργοποιημένο"
   },
-  "activate": {
-    "message": "Activate"
+  "restoreAccess": {
+    "message": "Restore Access"
   },
   "premium": {
     "message": "Premium",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "Απενεργοποίηση"
   },
-  "deactivate": {
-    "message": "Deactivate"
+  "revokeAccess": {
+    "message": "Revoke Access"
   },
   "twoStepLoginProviderEnabled": {
     "message": "Ο πάροχος σύνδεσης δύο βημάτων του λογαριασμού σας, είναι ενεργοποιημένος."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "Χρέωση"
   },
+  "billingPlanLabel": {
+    "message": "Billing Plan"
+  },
+  "paymentType": {
+    "message": "Payment Type"
+  },
   "accountCredit": {
     "message": "Λογαριασμός Πίστωσης",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "έτος"
   },
+  "yr": {
+    "message": "yr"
+  },
   "month": {
     "message": "μήνας"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Πληροφορίες Χρέωσης"
   },
+  "billingTrialSubLabel": {
+    "message": "Your payment method will not be charged during the 7 day free trial."
+  },
   "creditCard": {
     "message": "Πιστωτική Κάρτα"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Thanks for signing up for Bitwarden for $PLAN$!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "Your $PLAN$ 7 day free trial will be converted to a paid subscription after 7 days.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "We've sent a confirmation email to your team's billing email at "
+  },
   "monthly": {
     "message": "Μηνιαία"
   },
   "annually": {
     "message": "Ετησίως"
   },
+  "annual": {
+    "message": "Annual"
+  },
   "basePrice": {
     "message": "Βασική Τιμή"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "Είστε βέβαιοι ότι θέλετε να αφαιρέσετε αυτό τον χρήστη;"
   },
-  "deactivateUserConfirmation": {
-    "message": "The member will no longer have access to the organization, but will still have access to their individual vault."
+  "removeOrgUserConfirmation": {
+    "message": "When a member is removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again."
   },
-  "activateUserConfirmation": {
-    "message": "Are you sure you want to activate this user, granting them access to the organization?"
+  "revokeUserConfirmation": {
+    "message": "When a member is revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Προσοχή! Αυτός ο χρήστης απαιτεί σύνδεση κλειδιού για τη διαχείριση της κρυπτογράφησης του. Η αφαίρεση αυτού του χρήστη από τον οργανισμό σας θα απενεργοποιήσει οριστικά τον λογαριασμό του. Αυτή η ενέργεια δεν μπορεί να αναιρεθεί. Θέλετε να συνεχίσετε;"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Deactivated user $ID$.",
+  "removeUserIdAccess": {
+    "message": "Remove $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Activated user $ID$.",
+  "revokedUserId": {
+    "message": "Revoked organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Deactivate user $ID$?",
+  "restoredUserId": {
+    "message": "Restored organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Activate user $ID$?",
+  "revokeUserId": {
+    "message": "Revoke $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "Απενεργοποιημένο"
   },
-  "deactivated": {
-    "message": "Deactivated"
+  "revoked": {
+    "message": "Revoked"
   },
   "sendLink": {
     "message": "Αποστολή Συνδέσμου",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "Είστε βέβαιοι ότι θέλετε να καταργήσετε τους ακόλουθους χρήστες? Η διαδικασία μπορεί να διαρκέσει μερικά δευτερόλεπτα για να ολοκληρωθεί και δεν μπορεί να διακοπεί ή να ακυρωθεί."
   },
-  "deactivateUsersWarning": {
-    "message": "Are you sure you want to deactivate the following members? They will no longer have access to the organization, but will still have access to their individual vaults. The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "removeOrgUsersConfirmation": {
+    "message": "When member(s) are removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "activateUsersWarning": {
-    "message": "Are you sure you want to activate the following members, granting them access to the organization? The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "revokeUsersWarning": {
+    "message": "When member(s) are revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
   "theme": {
     "message": "Θέμα"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "Καταργήθηκε με επιτυχία"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Deactivated successfully"
+  "bulkRevokedMessage": {
+    "message": "Revoked organization access successfully"
   },
-  "bulkActivatedMessage": {
-    "message": "Activated successfully"
+  "bulkRestoredMessage": {
+    "message": "Restored organization access successfully"
   },
   "bulkFilteredMessage": {
     "message": "Εξαιρείται, δεν ισχύει για αυτήν την ενέργεια."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "Αφαίρεση Χρηστών"
   },
-  "deactivateUsers": {
-    "message": "Deactivate Users"
+  "revokeUsers": {
+    "message": "Revoke Users"
   },
-  "activateUsers": {
-    "message": "Activate Users"
+  "restoreUsers": {
+    "message": "Restore Users"
   },
   "error": {
     "message": "Σφάλμα"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Χορηγία Δημιουργήθηκε"
   },
-  "revoke": {
-    "message": "Ανάκληση"
-  },
   "emailSent": {
     "message": "Το Email Εστάλη"
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "SCIM Provisioning",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Enable SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Set up your preferred identity provider by configuring the URL and SCIM API Key",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "This API key has access to manage users within your organization. It should be kept secret."
+  },
+  "copyScimKey": {
+    "message": "Copy the SCIM API Key to your clipboard",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Rotate the SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Are you sure you want to rotate the SCIM API Key? The current key will no longer work for any existing integrations.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Rotate Key"
+  },
+  "scimApiKey": {
+    "message": "SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Copy the SCIM endpoint URL to your clipboard",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "SCIM URL",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "The SCIM API Key has been successfully rotated",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "SCIM settings have been saved successfully",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Input is required."
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "On"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/en_GB/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "Your new account has been created! You may now log in."
   },
+  "trialAccountCreated": {
+    "message": "Account created successfully."
+  },
   "masterPassSent": {
     "message": "We've sent you an email with your master password hint."
   },
@@ -1076,7 +1079,7 @@
     "message": "Delete account"
   },
   "deleteAccountDesc": {
-    "message": "Proceed below to delete your account and all associated data."
+    "message": "Proceed below to delete your account and all vault data."
   },
   "deleteAccountWarning": {
     "message": "Deleting your account is permanent. It cannot be undone."
@@ -1085,7 +1088,7 @@
     "message": "Account deleted"
   },
   "accountDeletedDesc": {
-    "message": "Your account has been closed and all associated data has been deleted."
+    "message": "Your Bitwarden account and vault data were permanently deleted."
   },
   "myAccount": {
     "message": "My account"
@@ -1167,14 +1170,14 @@
     "message": "Show a recognisable image next to each login."
   },
   "enableGravatars": {
-    "message": "Enable Gravatars",
+    "message": "Show Gravatars",
     "description": "Use avatar images loaded from gravatar.com."
   },
   "enableGravatarsDesc": {
     "message": "Use avatar images loaded from gravatar.com."
   },
   "enableFullWidth": {
-    "message": "Enable full width layout",
+    "message": "Display full width layout",
     "description": "Allows scaling the web vault UI's width"
   },
   "enableFullWidthDesc": {
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "Enabled"
   },
-  "activate": {
-    "message": "Activate"
+  "restoreAccess": {
+    "message": "Restore Access"
   },
   "premium": {
     "message": "Premium",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "Disable"
   },
-  "deactivate": {
-    "message": "Deactivate"
+  "revokeAccess": {
+    "message": "Revoke Access"
   },
   "twoStepLoginProviderEnabled": {
     "message": "This two-step login provider is enabled on your account."
@@ -1479,10 +1482,10 @@
     "description": "Vault Health Reports can be used to evaluate the security of your Bitwarden Personal or Organization Vault."
   },
   "unsecuredWebsitesReport": {
-    "message": "Unsecured websites report"
+    "message": "Unsecure Websites"
   },
   "unsecuredWebsitesReportDesc": {
-    "message": "Using unsecured websites with the http:// scheme can be dangerous. If the website allows, you should always access it using the https:// scheme so that your connection is encrypted."
+    "message": "URLs that start with http:// don’t use the best available encryption. Change the Login URIs for these accounts to https:// for safer browsing."
   },
   "unsecuredWebsitesFound": {
     "message": "Unsecured websites found"
@@ -1500,10 +1503,10 @@
     "message": "No items in your vault have unsecured URIs."
   },
   "inactive2faReport": {
-    "message": "Inactive 2FA report"
+    "message": "Inactive Two-step Login"
   },
   "inactive2faReportDesc": {
-    "message": "Two-factor authentication (2FA) is an important security setting that helps secure your accounts. If the website offers it, you should always enable two-factor authentication."
+    "message": "Two-step Login adds a layer of protection to your accounts. Turn on Two-Step Login using Bitwarden Authenticator for these accounts or use an alternative method."
   },
   "inactive2faFound": {
     "message": "Logins without 2FA found"
@@ -1524,10 +1527,10 @@
     "message": "Instructions"
   },
   "exposedPasswordsReport": {
-    "message": "Exposed passwords report"
+    "message": "Exposed Passwords"
   },
   "exposedPasswordsReportDesc": {
-    "message": "Exposed passwords are passwords that have been uncovered in known data breaches that were released publicly or sold on the dark web by hackers."
+    "message": "Passwords exposed in a data breach are easy targets for attackers. Change these passwords to prevent potential break-ins."
   },
   "exposedPasswordsFound": {
     "message": "Exposed passwords found"
@@ -1557,10 +1560,10 @@
     }
   },
   "weakPasswordsReport": {
-    "message": "Weak passwords report"
+    "message": "Weak Passwords"
   },
   "weakPasswordsReportDesc": {
-    "message": "Weak passwords can easily be guessed by hackers and automated tools that are used to crack passwords. The Bitwarden password generator can help you create strong passwords."
+    "message": "Weak passwords can be easily guessed by attackers. Change these passwords to strong ones using the Password Generator."
   },
   "weakPasswordsFound": {
     "message": "Weak passwords found"
@@ -1578,10 +1581,10 @@
     "message": "No items in your vault have weak passwords."
   },
   "reusedPasswordsReport": {
-    "message": "Reused passwords report"
+    "message": "Reused Passwords"
   },
   "reusedPasswordsReportDesc": {
-    "message": "If a service that you use is compromised, reusing the same password elsewhere can allow hackers to easily gain access to more of your online accounts. You should use a unique password for every account or service."
+    "message": "Reusing passwords makes it easier for attackers to break into multiple accounts. Change these passwords so that each is unique."
   },
   "reusedPasswordsFound": {
     "message": "Reused passwords found"
@@ -1608,10 +1611,10 @@
     }
   },
   "dataBreachReport": {
-    "message": "Data breach report"
+    "message": "Data Breach"
   },
   "breachDesc": {
-    "message": "A \"breach\" is an incident where a site's data has been illegally accessed by hackers and then released publicly. Review the types of data that were compromised (email addresses, passwords, credit cards etc.) and take appropriate action, such as changing passwords."
+    "message": "Breached accounts can expose your personal information. Secure breached accounts by enabling 2FA or creating a stronger password."
   },
   "breachCheckUsernameEmail": {
     "message": "Check any usernames or email addresses that you use."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "Billing"
   },
+  "billingPlanLabel": {
+    "message": "Billing Plan"
+  },
+  "paymentType": {
+    "message": "Payment Type"
+  },
   "accountCredit": {
     "message": "Account credit",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "year"
   },
+  "yr": {
+    "message": "yr"
+  },
   "month": {
     "message": "month"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Billing Information"
   },
+  "billingTrialSubLabel": {
+    "message": "Your payment method will not be charged during the 7 day free trial."
+  },
   "creditCard": {
     "message": "Credit card"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Thanks for signing up for Bitwarden for $PLAN$!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "Your $PLAN$ 7 day free trial will be converted to a paid subscription after 7 days.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "We've sent a confirmation email to your team's billing email at "
+  },
   "monthly": {
     "message": "Monthly"
   },
   "annually": {
     "message": "Annually"
   },
+  "annual": {
+    "message": "Annual"
+  },
   "basePrice": {
     "message": "Base price"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "Are you sure you want to remove this user?"
   },
-  "deactivateUserConfirmation": {
-    "message": "The member will no longer have access to the organisation, but will still have access to their individual vault."
+  "removeOrgUserConfirmation": {
+    "message": "When a member is removed, they no longer have access to organisation data and this action is irreversible. To add the member back to the organisation, they must be invited and onboarded again."
   },
-  "activateUserConfirmation": {
-    "message": "Are you sure you want to activate this user, granting them access to the organisation?"
+  "revokeUserConfirmation": {
+    "message": "When a member is revoked, they no longer have access to organisation data. To quickly restore member access, go to the Revoked tab."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Warning! This user requires Key Connector to manage their encryption. Removing this user from your organisation will permanently disable their account. This action cannot be undone. Do you want to proceed?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Deactivated user $ID$.",
+  "removeUserIdAccess": {
+    "message": "Remove $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Activated user $ID$.",
+  "revokedUserId": {
+    "message": "Revoked organisation access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Deactivate user $ID$?",
+  "restoredUserId": {
+    "message": "Restored organisation access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Activate user $ID$?",
+  "revokeUserId": {
+    "message": "Revoke $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3184,7 +3223,7 @@
     "message": "Vault timeout"
   },
   "vaultTimeoutDesc": {
-    "message": "Choose when your vault will timeout and perform the selected action."
+    "message": "Choose when your vault will take the vault timeout action."
   },
   "oneMinute": {
     "message": "1 minute"
@@ -3349,22 +3388,22 @@
     "message": "Master password requirements"
   },
   "masterPassPolicyDesc": {
-    "message": "Set minimum requirements for master password strength."
+    "message": "Set requirements for master password strength."
   },
   "twoStepLoginPolicyTitle": {
     "message": "Require two-step login"
   },
   "twoStepLoginPolicyDesc": {
-    "message": "Require users to set up two-step login on their personal accounts."
+    "message": "Require members to set up two-step login."
   },
   "twoStepLoginPolicyWarning": {
-    "message": "Organisation members who are not Owners or Administrators and do not have two-step login enabled for their personal account will be removed from the organisation and will receive an email notifying them about the change."
+    "message": "Organisation members who are not Owners or Administrators and do not have two-step login turned on for their account will be removed from the organisation and will receive an email notifying them about the change."
   },
   "twoStepLoginPolicyUserWarning": {
     "message": "You are a member of an organisation that requires two-step login to be enabled on your user account. If you disable all two-step login providers you will be automatically removed from these organisations."
   },
   "passwordGeneratorPolicyDesc": {
-    "message": "Set minimum requirements for password generator configuration."
+    "message": "Set requirements for password generator."
   },
   "passwordGeneratorPolicyInEffect": {
     "message": "One or more organisation policies are affecting your generator settings."
@@ -3424,10 +3463,10 @@
     "message": "Vault timeout action"
   },
   "vaultTimeoutActionLockDesc": {
-    "message": "A locked vault requires that you re-enter your master password to access it again."
+    "message": "Master password or other unlock method is required to access your vault again."
   },
   "vaultTimeoutActionLogOutDesc": {
-    "message": "A logged out vault requires that you re-authenticate to access it again."
+    "message": "Re-authentication is required to access your vault again."
   },
   "lock": {
     "message": "Lock",
@@ -3585,7 +3624,7 @@
     "message": "Single organisation"
   },
   "singleOrgDesc": {
-    "message": "Restrict users from being able to join any other organisations."
+    "message": "Restrict members from joining other organisations."
   },
   "singleOrgBlockCreateMessage": {
     "message": "Your current organisation has a policy that does not allow you to join more than one organisation. Please contact your organisation admins or sign up from a different Bitwarden account."
@@ -3594,16 +3633,16 @@
     "message": "Organisation members who are not Owners or Administrators and are already a member of another organisation will be removed from your organisation."
   },
   "requireSso": {
-    "message": "Single sign-on authentication"
+    "message": "Require single sign-on authentication"
   },
   "requireSsoPolicyDesc": {
-    "message": "Require users to log in with the Enterprise Single Sign-On method."
+    "message": "Require members to log in with the Enterprise Single Sign-On method."
   },
   "prerequisite": {
     "message": "Prerequisite"
   },
   "requireSsoPolicyReq": {
-    "message": "The Single Organisation enterprise policy must be enabled before activating this policy."
+    "message": "The Single Organization enterprise policy must be turned on before activating this policy."
   },
   "requireSsoPolicyReqError": {
     "message": "Single Organisation policy not enabled."
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "Disabled"
   },
-  "deactivated": {
-    "message": "Deactivated"
+  "revoked": {
+    "message": "Revoked"
   },
   "sendLink": {
     "message": "Send link",
@@ -3898,10 +3937,10 @@
     }
   },
   "personalOwnership": {
-    "message": "Personal Ownership"
+    "message": "Remove individual vault"
   },
   "personalOwnershipPolicyDesc": {
-    "message": "Require users to save vault items to an organisation by removing the personal ownership option."
+    "message": "Require members to save items to an organization by removing the individual vault option."
   },
   "personalOwnershipExemption": {
     "message": "Organisation Owners and Administrators are exempt from this policy's enforcement."
@@ -3910,10 +3949,10 @@
     "message": "Due to an Enterprise Policy, you are restricted from saving items to your personal vault. Change the Ownership option to an organisation and choose from available Collections."
   },
   "disableSend": {
-    "message": "Disable Send"
+    "message": "Remove Send"
   },
   "disableSendPolicyDesc": {
-    "message": "Do not allow users to create or edit a Bitwarden Send. Deleting an existing Send is still allowed.",
+    "message": "Do not allow members to create or edit sends.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "disableSendExemption": {
@@ -3928,7 +3967,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendOptions": {
-    "message": "Send Options",
+    "message": "Send options",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendOptionsPolicyDesc": {
@@ -3939,7 +3978,7 @@
     "message": "Organisation users that can manage the organisation's policies are exempt from this policy's enforcement."
   },
   "disableHideEmail": {
-    "message": "Do not allow users to hide their email address from recipients when creating or editing a Send.",
+    "message": "Always show member’s email address with recipients when creating or editing a send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendOptionsPolicyInEffect": {
@@ -4232,13 +4271,13 @@
     "message": "Password reset success!"
   },
   "resetPasswordEnrollmentWarning": {
-    "message": "Enrollment will allow organisation administrators to change your master password. Are you sure you want to enroll?"
+    "message": "Enrolment will allow organisation administrators to change your master password"
   },
   "resetPasswordPolicy": {
-    "message": "Master Password Reset"
+    "message": "Master password reset"
   },
   "resetPasswordPolicyDescription": {
-    "message": "Allow administrators in the organisation to reset organisation users' master password."
+    "message": "Allow admins to reset master passwords for members."
   },
   "resetPasswordPolicyWarning": {
     "message": "Users in the organisation will need to self-enroll or be auto-enrolled before administrators can reset their master password."
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "Are you sure you want to remove the following users? The process may take a few seconds to complete and cannot be interrupted or cancelled."
   },
-  "deactivateUsersWarning": {
-    "message": "Are you sure you want to deactivate the following members? They will no longer have access to the organisation, but will still have access to their individual vaults. The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "removeOrgUsersConfirmation": {
+    "message": "When member(s) are removed, they no longer have access to organisation data and this action is irreversible. To add the member back to the organisation, they must be invited and onboarded again. The process may take a few seconds to complete and cannot be interrupted or cancelled."
   },
-  "activateUsersWarning": {
-    "message": "Are you sure you want to activate the following members, granting them access to the organisation? The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "revokeUsersWarning": {
+    "message": "When member(s) are revoked, they no longer have access to organisation data. To quickly restore member access, go to the Revoked tab. The process may take a few seconds to complete and cannot be interrupted or cancelled."
   },
   "theme": {
     "message": "Theme"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "Removed successfully"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Deactivated successfully"
+  "bulkRevokedMessage": {
+    "message": "Revoked organisation access successfully"
   },
-  "bulkActivatedMessage": {
-    "message": "Activated successfully"
+  "bulkRestoredMessage": {
+    "message": "Restored organisation access successfully"
   },
   "bulkFilteredMessage": {
     "message": "Excluded, not applicable for this action."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "Remove Users"
   },
-  "deactivateUsers": {
-    "message": "Deactivate Users"
+  "revokeUsers": {
+    "message": "Revoke Users"
   },
-  "activateUsers": {
-    "message": "Activate Users"
+  "restoreUsers": {
+    "message": "Restore Users"
   },
   "error": {
     "message": "Error"
@@ -4482,10 +4521,10 @@
     "message": "Your Master Password does not meet the policy requirements of this organisation. In order to join the organisation, 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": "Vault timeout"
   },
   "maximumVaultTimeoutDesc": {
-    "message": "Configure a maximum vault timeout for all users."
+    "message": "Set a maximum vault timeout for members."
   },
   "maximumVaultTimeoutLabel": {
     "message": "Maximum Vault Timeout"
@@ -4525,10 +4564,10 @@
     "message": "Vault Timeout is not within allowed range."
   },
   "disablePersonalVaultExport": {
-    "message": "Disable Personal Vault Export"
+    "message": "Remove individual vault export"
   },
   "disablePersonalVaultExportDesc": {
-    "message": "Prohibits users from exporting their private vault data."
+    "message": "Do not allow members to export their individual vault data."
   },
   "vaultExportDisabled": {
     "message": "Vault Export Disabled"
@@ -4573,25 +4612,25 @@
     "message": "OIDC Redirect Behavior"
   },
   "getClaimsFromUserInfoEndpoint": {
-    "message": "Get Claims From User Info Endpoint"
+    "message": "Get claims from user info endpoint"
   },
   "additionalScopes": {
-    "message": "Additional/Custom Scopes (comma delimited)"
+    "message": "Custom Scopes"
   },
   "additionalUserIdClaimTypes": {
-    "message": "Additional/Custom User ID Claim Types (comma delimited)"
+    "message": "Custom User ID Claim Types"
   },
   "additionalEmailClaimTypes": {
-    "message": "Additional/Custom Email Claim Types (comma delimited)"
+    "message": "Email Claim Types"
   },
   "additionalNameClaimTypes": {
-    "message": "Additional/Custom Name Claim Types (comma delimited)"
+    "message": "Custom Name Claim Types"
   },
   "acrValues": {
-    "message": "Requested Authentication Context Class Reference values (acr_values)"
+    "message": "Requested Authentication Context Class Reference values"
   },
   "expectedReturnAcrValue": {
-    "message": "Expected \"acr\" Claim Value In Response (acr validation)"
+    "message": "Expected \"acr\" Claim Value In Response"
   },
   "spEntityId": {
     "message": "SP Entity ID"
@@ -4615,10 +4654,10 @@
     "message": "Minimum Incoming Signing Algorithm"
   },
   "spWantAssertionsSigned": {
-    "message": "Want Assertions Signed"
+    "message": "Expect signed assertions"
   },
   "spValidateCertificates": {
-    "message": "Validate Certificates"
+    "message": "Validate certificates"
   },
   "idpEntityId": {
     "message": "Entity ID"
@@ -4639,7 +4678,7 @@
     "message": "Outbound Signing Algorithm"
   },
   "idpAllowUnsolicitedAuthnResponse": {
-    "message": "Allow Unsolicited Authentication Response"
+    "message": "Allow unsolicited authentication response"
   },
   "idpAllowOutboundLogoutRequests": {
     "message": "Allow outbound logout requests"
@@ -4687,7 +4726,7 @@
     "message": "Enter your personal email to redeem Bitwarden Families"
   },
   "sponsoredFamiliesLeaveCopy": {
-    "message": "If you leave or are removed from the sponsoring organisation, your Families plan will expire at the end of the billing period."
+    "message": "If you remove an offer or are removed from the sponsoring organisation, your Families sponsorship will expire at the next renewal date."
   },
   "acceptBitwardenFamiliesHelp": {
     "message": "Accept offer for an existing organisation or create a new Families organisation."
@@ -4755,14 +4794,11 @@
   "sponsorshipCreated": {
     "message": "Sponsorship Created"
   },
-  "revoke": {
-    "message": "Revoke"
-  },
   "emailSent": {
     "message": "Email Sent"
   },
   "revokeSponsorshipConfirmation": {
-    "message": "After removing this account, the Families organisation owner will be responsible for this subscription and related invoices. Are you sure you want to continue?"
+    "message": "After removing this account, the Families plan sponsorship will expire at the end of the billing period. You will not be able to redeem a new sponsorship offer until the existing one expires. Are you sure you want to continue?"
   },
   "removeSponsorshipSuccess": {
     "message": "Sponsorship Removed"
@@ -4819,11 +4855,11 @@
     "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": "Use the",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Use the require single-sign-on authentication policy to require all members to log in with SSO.'"
   },
   "ssoPolicyHelpLink": {
-    "message": "SSO Authentication policy",
+    "message": "require single-sign-on authentication policy",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Use the require single-sign-on authentication policy to require all members to log in with SSO.'"
   },
   "ssoPolicyHelpEnd": {
@@ -4831,7 +4867,7 @@
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Use the require single-sign-on authentication policy to require all members to log in with SSO.'"
   },
   "ssoPolicyHelpKeyConnector": {
-    "message": "SSO Authentication and Single Organisation policies are required to set up Key Connector decryption."
+    "message": "The require SSO authentication and single organisation policies are required to set up Key Connector decryption."
   },
   "memberDecryptionOption": {
     "message": "Member Decryption Options"
@@ -5098,7 +5134,7 @@
     "message": "Service"
   },
   "unknownCipher": {
-    "message": "Unknown Item, you may need to login with another account to access this item."
+    "message": "Unknown Item, you may need to request permission to access this item."
   },
   "cannotSponsorSelf": {
     "message": "You cannot redeem for the active account. Enter a different email."
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "SCIM Provisioning",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Enable SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Set up your preferred identity provider by configuring the URL and SCIM API Key",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "This API key has access to manage users within your organisation. It should be kept secret."
+  },
+  "copyScimKey": {
+    "message": "Copy the SCIM API Key to your clipboard",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Rotate the SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Are you sure you want to rotate the SCIM API Key? The current key will no longer work for any existing integrations.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Rotate Key"
+  },
+  "scimApiKey": {
+    "message": "SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Copy the SCIM endpoint URL to your clipboard",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "SCIM URL",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "The SCIM API Key has been successfully rotated",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "SCIM settings have been saved successfully",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Input is required."
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "On"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/en_IN/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "Your new account has been created! You may now log in."
   },
+  "trialAccountCreated": {
+    "message": "Account created successfully."
+  },
   "masterPassSent": {
     "message": "We've sent you an email with your master password hint."
   },
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "Enabled"
   },
-  "activate": {
-    "message": "Activate"
+  "restoreAccess": {
+    "message": "Restore Access"
   },
   "premium": {
     "message": "Premium",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "Disable"
   },
-  "deactivate": {
-    "message": "Deactivate"
+  "revokeAccess": {
+    "message": "Revoke Access"
   },
   "twoStepLoginProviderEnabled": {
     "message": "This two-step login provider is enabled on your account."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "Billing"
   },
+  "billingPlanLabel": {
+    "message": "Billing Plan"
+  },
+  "paymentType": {
+    "message": "Payment Type"
+  },
   "accountCredit": {
     "message": "Account credit",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "year"
   },
+  "yr": {
+    "message": "yr"
+  },
   "month": {
     "message": "month"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Billing Information"
   },
+  "billingTrialSubLabel": {
+    "message": "Your payment method will not be charged during the 7 day free trial."
+  },
   "creditCard": {
     "message": "Credit card"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Thanks for signing up for Bitwarden for $PLAN$!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "Your $PLAN$ 7 day free trial will be converted to a paid subscription after 7 days.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "We've sent a confirmation email to your team's billing email at "
+  },
   "monthly": {
     "message": "Monthly"
   },
   "annually": {
     "message": "Annually"
   },
+  "annual": {
+    "message": "Annual"
+  },
   "basePrice": {
     "message": "Base price"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "Are you sure you want to remove this user?"
   },
-  "deactivateUserConfirmation": {
-    "message": "The member will no longer have access to the organization, but will still have access to their individual vault."
+  "removeOrgUserConfirmation": {
+    "message": "When a member is removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again."
   },
-  "activateUserConfirmation": {
-    "message": "Are you sure you want to activate this user, granting them access to the organization?"
+  "revokeUserConfirmation": {
+    "message": "When a member is revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Warning! This user requires Key Connector to manage their encryption. Removing this user from your organization will permanently disable their account. This action cannot be undone. Do you want to proceed?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Deactivated user $ID$.",
+  "removeUserIdAccess": {
+    "message": "Remove $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Activated user $ID$.",
+  "revokedUserId": {
+    "message": "Revoked organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Deactivate user $ID$?",
+  "restoredUserId": {
+    "message": "Restored organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Activate user $ID$?",
+  "revokeUserId": {
+    "message": "Revoke $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "Disabled"
   },
-  "deactivated": {
-    "message": "Deactivated"
+  "revoked": {
+    "message": "Revoked"
   },
   "sendLink": {
     "message": "Send Link",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "Are you sure you want to remove the following users? The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "deactivateUsersWarning": {
-    "message": "Are you sure you want to deactivate the following members? They will no longer have access to the organization, but will still have access to their individual vaults. The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "removeOrgUsersConfirmation": {
+    "message": "When member(s) are removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "activateUsersWarning": {
-    "message": "Are you sure you want to activate the following members, granting them access to the organization? The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "revokeUsersWarning": {
+    "message": "When member(s) are revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
   "theme": {
     "message": "Theme"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "Removed successfully"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Deactivated successfully"
+  "bulkRevokedMessage": {
+    "message": "Revoked organization access successfully"
   },
-  "bulkActivatedMessage": {
-    "message": "Activated successfully"
+  "bulkRestoredMessage": {
+    "message": "Restored organization access successfully"
   },
   "bulkFilteredMessage": {
     "message": "Excluded, not applicable for this action."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "Remove Users"
   },
-  "deactivateUsers": {
-    "message": "Deactivate Users"
+  "revokeUsers": {
+    "message": "Revoke Users"
   },
-  "activateUsers": {
-    "message": "Activate Users"
+  "restoreUsers": {
+    "message": "Restore Users"
   },
   "error": {
     "message": "Error"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Sponsorship Created"
   },
-  "revoke": {
-    "message": "Revoke"
-  },
   "emailSent": {
     "message": "Email Sent"
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "SCIM Provisioning",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Enable SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Set up your preferred identity provider by configuring the URL and SCIM API Key",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "This API key has access to manage users within your organization. It should be kept secret."
+  },
+  "copyScimKey": {
+    "message": "Copy the SCIM API Key to your clipboard",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Rotate the SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Are you sure you want to rotate the SCIM API Key? The current key will no longer work for any existing integrations.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Rotate Key"
+  },
+  "scimApiKey": {
+    "message": "SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Copy the SCIM endpoint URL to your clipboard",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "SCIM URL",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "The SCIM API Key has been successfully rotated",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "SCIM settings have been saved successfully",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Input is required."
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "On"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/eo/messages.json

@@ -1,6 +1,6 @@
 {
   "pageTitle": {
-    "message": "Kasa retejo de $APP_NAME$",
+    "message": "Reta Trezorejo $APP_NAME$",
     "description": "The title of the website in the browser window.",
     "placeholders": {
       "app_name": {
@@ -10,7 +10,7 @@
     }
   },
   "whatTypeOfItem": {
-    "message": "Kia tipo de elemento estas ĉi tio?"
+    "message": "Kiuspeca estas ĉi tiu ero?"
   },
   "name": {
     "message": "Nomo"
@@ -47,7 +47,7 @@
     "message": "Notoj"
   },
   "customFields": {
-    "message": "Propraj kampoj"
+    "message": "Tekstujoj Uzantfaritaj"
   },
   "cardholderName": {
     "message": "Nomo de la posedanto de la karto"
@@ -128,13 +128,13 @@
     "message": "S-ro"
   },
   "mrs": {
-    "message": "Sinjorino"
+    "message": "S-ino"
   },
   "ms": {
-    "message": "Sinjorino"
+    "message": "F-ino"
   },
   "dr": {
-    "message": "Dr"
+    "message": "Dr-o"
   },
   "expirationMonth": {
     "message": "Monato de validoperiodo"
@@ -282,7 +282,7 @@
     "description": "Search item type"
   },
   "searchVault": {
-    "message": "Serĉi Volbon"
+    "message": "Traserĉu Trezorejon"
   },
   "allItems": {
     "message": "Ĉiuj Eroj"
@@ -333,7 +333,7 @@
     "message": "Lasta nomo"
   },
   "fullName": {
-    "message": "Full Name"
+    "message": "Plena Nomo"
   },
   "address1": {
     "message": "Adreso 1"
@@ -385,7 +385,7 @@
     "message": "Kunhavigi"
   },
   "moveToOrganization": {
-    "message": "Move to Organization"
+    "message": "Movu al Organizo"
   },
   "valueCopied": {
     "message": "$VALUE$ kopiita",
@@ -422,31 +422,31 @@
     "description": "Copy URI to clipboard"
   },
   "me": {
-    "message": "Me"
+    "message": "Mi"
   },
   "myVault": {
-    "message": "Mia Volbo"
+    "message": "Mia Trezorejo"
   },
   "allVaults": {
-    "message": "All Vaults"
+    "message": "Ĉiuj Trezorejoj"
   },
   "vault": {
-    "message": "Volbo"
+    "message": "Trezorejo"
   },
   "vaults": {
-    "message": "Vaults"
+    "message": "Trezorejoj"
   },
   "vaultItems": {
-    "message": "Vault Items"
+    "message": "Trezorejaj Eroj"
   },
   "moveSelectedToOrg": {
-    "message": "Move Selected to Organization"
+    "message": "Movu Elektitaĵojn al Organizo"
   },
   "deleteSelected": {
     "message": "Forigi Elektitajn"
   },
   "moveSelected": {
-    "message": "Movi Elektitan"
+    "message": "Movu Elektitaĵojn"
   },
   "selectAll": {
     "message": "Elekti ĉiujn"
@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "Via nova konto kreiĝis! Vi nun povas ensaluti."
   },
+  "trialAccountCreated": {
+    "message": "Account created successfully."
+  },
   "masterPassSent": {
     "message": "Ni sendis al vi retpoŝton kun via ĉefa pasvorta sugesto."
   },
@@ -660,7 +663,7 @@
     "message": "Malŝlosi"
   },
   "loggedInAsEmailOn": {
-    "message": "Ensalutinta kiel $EMAIL$ ĉe $HOSTNAME $.",
+    "message": "Ensalutinta kiel $EMAIL$ ĉe $HOSTNAME$.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -700,7 +703,7 @@
     "message": "Vi ne apartenas al iuj organizoj. Organizoj permesas al vi sekure dividi erojn kun aliaj uzantoj."
   },
   "versionNumber": {
-    "message": "Versio $VERSION_NUMBER $",
+    "message": "Versio $VERSION_NUMBER$",
     "placeholders": {
       "version_number": {
         "content": "$1",
@@ -867,7 +870,7 @@
     "message": "Averto"
   },
   "confirmVaultExport": {
-    "message": "Konfirmi Volbon-Eksportadon"
+    "message": "Konfirmu Eksportadon de Trezorejo"
   },
   "exportWarningDesc": {
     "message": "Ĉi tiu eksportado enhavas viajn volbajn datumojn en neĉifrita formato. Vi ne devas stoki aŭ sendi la eksportitan dosieron per nesekuraj kanaloj (kiel retpoŝto). Forigu ĝin tuj post kiam vi finuzos ĝin."
@@ -882,7 +885,7 @@
     "message": "Export"
   },
   "exportVault": {
-    "message": "Eksporti Volbon"
+    "message": "Eksportu Trezorejon"
   },
   "fileFormat": {
     "message": "Dosierformato"
@@ -1052,10 +1055,10 @@
     "message": "Ĉiuj Sesioj Neaŭtorizitaj"
   },
   "purgeVault": {
-    "message": "Purigi Volbon"
+    "message": "Malplenigu Trezorejon"
   },
   "purgedOrganizationVault": {
-    "message": "Purigita organizo-volbo."
+    "message": "Malpleniĝis trezorejo de organizo."
   },
   "vaultAccessedByProvider": {
     "message": "Vault accessed by provider."
@@ -1067,10 +1070,10 @@
     "message": "Sekvu sube por forigi ĉiujn erojn en la trezorejo de la organizo."
   },
   "purgeVaultWarning": {
-    "message": "Purigi vian trezorejon estas konstanta. Ĝi ne povas esti malfarita."
+    "message": "Malplenigado de via trezorejo estas daŭra. Malfarado estos malebla."
   },
   "vaultPurged": {
-    "message": "Via trezorejo estis elpurigita."
+    "message": "Via trezorejo malpleniĝis."
   },
   "deleteAccount": {
     "message": "Forigi konton"
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "Enŝaltita"
   },
-  "activate": {
-    "message": "Activate"
+  "restoreAccess": {
+    "message": "Restore Access"
   },
   "premium": {
     "message": "Premium",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "Neebligi"
   },
-  "deactivate": {
-    "message": "Deactivate"
+  "revokeAccess": {
+    "message": "Revoke Access"
   },
   "twoStepLoginProviderEnabled": {
     "message": "Ĉi tiu du-ŝtupa ensaluta provizanto estas ebligita en via konto."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "Fakturado"
   },
+  "billingPlanLabel": {
+    "message": "Billing Plan"
+  },
+  "paymentType": {
+    "message": "Payment Type"
+  },
   "accountCredit": {
     "message": "Kredita Konto",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "jaro"
   },
+  "yr": {
+    "message": "yr"
+  },
   "month": {
     "message": "monato"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Fakturaj Informoj"
   },
+  "billingTrialSubLabel": {
+    "message": "Your payment method will not be charged during the 7 day free trial."
+  },
   "creditCard": {
     "message": "Kreditkarto"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Thanks for signing up for Bitwarden for $PLAN$!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "Your $PLAN$ 7 day free trial will be converted to a paid subscription after 7 days.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "We've sent a confirmation email to your team's billing email at "
+  },
   "monthly": {
     "message": "Monata"
   },
   "annually": {
     "message": "Ĉiujare"
   },
+  "annual": {
+    "message": "Annual"
+  },
   "basePrice": {
     "message": "Baza Prezo"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "Ĉu vi certe volas forigi ĉi tiun uzanton?"
   },
-  "deactivateUserConfirmation": {
-    "message": "The member will no longer have access to the organization, but will still have access to their individual vault."
+  "removeOrgUserConfirmation": {
+    "message": "When a member is removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again."
   },
-  "activateUserConfirmation": {
-    "message": "Are you sure you want to activate this user, granting them access to the organization?"
+  "revokeUserConfirmation": {
+    "message": "When a member is revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Warning! This user requires Key Connector to manage their encryption. Removing this user from your organization will permanently disable their account. This action cannot be undone. Do you want to proceed?"
@@ -2380,7 +2419,7 @@
     "description": "Desktop app"
   },
   "webVault": {
-    "message": "Reta Volbo"
+    "message": "Rettrezorejo"
   },
   "loggedIn": {
     "message": "Ensalutinta."
@@ -2404,10 +2443,10 @@
     "message": "Ensaluta provo malsukcesis kun malĝusta du-ŝtupa ensaluto."
   },
   "exportedVault": {
-    "message": "Eksportita trezorejo."
+    "message": "Eksportiĝis trezorejo."
   },
   "exportedOrganizationVault": {
-    "message": "Eksportita organizo-volbo."
+    "message": "Eksportiĝis trezorejo de organizo."
   },
   "editedOrgSettings": {
     "message": "Redaktitaj organizaj agordoj."
@@ -2422,7 +2461,7 @@
     }
   },
   "editedItemId": {
-    "message": "Redaktita ero $ID $.",
+    "message": "Redaktiĝis ero $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2449,7 +2488,7 @@
     }
   },
   "viewedItemId": {
-    "message": "Vidita ero $ID $.",
+    "message": "Vidiĝis ero $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2458,7 +2497,7 @@
     }
   },
   "viewedPasswordItemId": {
-    "message": "Vidita pasvorto por ero $ID $.",
+    "message": "Vidiĝis pasvorto de ero $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2467,7 +2506,7 @@
     }
   },
   "viewedHiddenFieldItemId": {
-    "message": "Vidita kaŝita kampo por ero $ID $.",
+    "message": "Vidiĝis tekstujo kaŝita de ero $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2476,7 +2515,7 @@
     }
   },
   "viewedSecurityCodeItemId": {
-    "message": "Vidita sekureca kodo por ero $ID $.",
+    "message": "Vidiĝis sekureca kodo de ero $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2485,7 +2524,7 @@
     }
   },
   "copiedPasswordItemId": {
-    "message": "Kopiita pasvorto por ero $ID $.",
+    "message": "Kopiiĝis pasvorto de ero $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2494,7 +2533,7 @@
     }
   },
   "copiedHiddenFieldItemId": {
-    "message": "Kopiita kaŝita kampo por ero $ID $.",
+    "message": "Kopiiĝis tekstujo kaŝita de ero $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2503,7 +2542,7 @@
     }
   },
   "copiedSecurityCodeItemId": {
-    "message": "Kopiita sekureca kodo por ero $ID $.",
+    "message": "Kopiiĝis sekureca kodo de ero $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Deactivated user $ID$.",
+  "removeUserIdAccess": {
+    "message": "Remove $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Activated user $ID$.",
+  "revokedUserId": {
+    "message": "Revoked organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Deactivate user $ID$?",
+  "restoredUserId": {
+    "message": "Restored organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Activate user $ID$?",
+  "revokeUserId": {
+    "message": "Revoke $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2674,7 +2713,7 @@
     }
   },
   "editedUserId": {
-    "message": "Redaktita uzanto $ID $.",
+    "message": "Redaktiĝis uzanto $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2767,7 +2806,7 @@
     "message": "Resendi Inviton"
   },
   "resendEmail": {
-    "message": "Resend Email"
+    "message": "Resendu Retpoŝton"
   },
   "hasBeenReinvited": {
     "message": "$USER$ estis reenvitita.",
@@ -3181,7 +3220,7 @@
     "message": "Filtriloj"
   },
   "vaultTimeout": {
-    "message": "Tempomezuro de Volbo"
+    "message": "Tempolimo de trezorejo"
   },
   "vaultTimeoutDesc": {
     "message": "Elektu kiam via trezorejo eksvalidiĝos kaj plenumos la elektitan agon."
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "Neebligita"
   },
-  "deactivated": {
-    "message": "Deactivated"
+  "revoked": {
+    "message": "Revoked"
   },
   "sendLink": {
     "message": "Sendi ligon",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "Are you sure you want to remove the following users? The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "deactivateUsersWarning": {
-    "message": "Are you sure you want to deactivate the following members? They will no longer have access to the organization, but will still have access to their individual vaults. The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "removeOrgUsersConfirmation": {
+    "message": "When member(s) are removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "activateUsersWarning": {
-    "message": "Are you sure you want to activate the following members, granting them access to the organization? The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "revokeUsersWarning": {
+    "message": "When member(s) are revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
   "theme": {
     "message": "Theme"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "Removed successfully"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Deactivated successfully"
+  "bulkRevokedMessage": {
+    "message": "Revoked organization access successfully"
   },
-  "bulkActivatedMessage": {
-    "message": "Activated successfully"
+  "bulkRestoredMessage": {
+    "message": "Restored organization access successfully"
   },
   "bulkFilteredMessage": {
     "message": "Excluded, not applicable for this action."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "Remove Users"
   },
-  "deactivateUsers": {
-    "message": "Deactivate Users"
+  "revokeUsers": {
+    "message": "Revoke Users"
   },
-  "activateUsers": {
-    "message": "Activate Users"
+  "restoreUsers": {
+    "message": "Restore Users"
   },
   "error": {
     "message": "Error"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Sponsorship Created"
   },
-  "revoke": {
-    "message": "Revoke"
-  },
   "emailSent": {
     "message": "Email Sent"
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "SCIM Provisioning",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Enable SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Set up your preferred identity provider by configuring the URL and SCIM API Key",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "This API key has access to manage users within your organization. It should be kept secret."
+  },
+  "copyScimKey": {
+    "message": "Copy the SCIM API Key to your clipboard",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Rotate the SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Are you sure you want to rotate the SCIM API Key? The current key will no longer work for any existing integrations.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Rotate Key"
+  },
+  "scimApiKey": {
+    "message": "SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Copy the SCIM endpoint URL to your clipboard",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "SCIM URL",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "The SCIM API Key has been successfully rotated",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "SCIM settings have been saved successfully",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Input is required."
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "On"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/es/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "¡Tu nueva cuenta ha sido creada! Ahora puedes acceder."
   },
+  "trialAccountCreated": {
+    "message": "Cuenta creada con éxito."
+  },
   "masterPassSent": {
     "message": "Te hemos enviado un correo electrónico con la pista de tu contraseña maestra."
   },
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "Activado"
   },
-  "activate": {
-    "message": "Activar"
+  "restoreAccess": {
+    "message": "Recuperar el acceso"
   },
   "premium": {
     "message": "Premium",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "Desactivar"
   },
-  "deactivate": {
-    "message": "Desactivar"
+  "revokeAccess": {
+    "message": "Revocar el acceso"
   },
   "twoStepLoginProviderEnabled": {
     "message": "Este proveedor de autenticación en dos pasos está habilitado para tu cuenta."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "Facturación"
   },
+  "billingPlanLabel": {
+    "message": "Plan de facturación"
+  },
+  "paymentType": {
+    "message": "Tipo de pago"
+  },
   "accountCredit": {
     "message": "Crédito de la cuenta",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "año"
   },
+  "yr": {
+    "message": "año"
+  },
   "month": {
     "message": "mes"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Información de facturación"
   },
+  "billingTrialSubLabel": {
+    "message": "Su método de pago no se utilizará para realizar el cobro durante la prueba gratuita de 7 días."
+  },
   "creditCard": {
     "message": "Tarjeta de crédito"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "¡Gracias por registrarte en Bitwarden para $PLAN$!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "Tu prueba gratuita de 7 días para el $PLAN$ se convertirá en una suscripción de pago después de estos 7 días.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "Hemos enviado un correo electrónico de confirmación al correo electrónico de facturación de tu equipo en "
+  },
   "monthly": {
     "message": "Mensual"
   },
   "annually": {
     "message": "Anual"
   },
+  "annual": {
+    "message": "Anual"
+  },
   "basePrice": {
     "message": "Precio base"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "¿Estás seguro de que deseas eliminar a este usuario?"
   },
-  "deactivateUserConfirmation": {
-    "message": "El miembro ya no tendrá acceso a la organización, pero todavía tendrá acceso a su caja fuerte individual."
+  "removeOrgUserConfirmation": {
+    "message": "Cuando se elimina un miembro de una organización, este ya no tiene acceso a los datos de la misma siendo esta acción es irreversible. Para agregar al miembro de nuevo a la organización, debe ser invitado y incorporado de nuevo."
   },
-  "activateUserConfirmation": {
-    "message": "¿Está seguro de que desea activar este usuario, concediéndole acceso a la organización?"
+  "revokeUserConfirmation": {
+    "message": "Cuando un miembro de una organización es revocado, ya no tiene acceso a los datos de la misma. Para restaurar rápidamente el acceso de los miembros, vaya a la pestaña Revocado."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "¡Advertencia! Este usuario requiere Conector de Clave para administrar su cifrado. Eliminar a este usuario de tu organización deshabilitará permanentemente su cuenta. Esta acción no se puede deshacer. ¿Quieres continuar?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Usuario $ID$ desactivado.",
+  "removeUserIdAccess": {
+    "message": "Eliminar acceso $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Usuario $ID$ activado.",
+  "revokedUserId": {
+    "message": "Acceso a la organización revocado para $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "¿Desactivar el usuario $ID$?",
+  "restoredUserId": {
+    "message": "Acceso a la organización restaurado para $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "¿Activar el usuario $ID$?",
+  "revokeUserId": {
+    "message": "Revocar el acceso a $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3219,7 +3258,7 @@
     "message": "La organización está desactivada."
   },
   "disabledOrganizationFilterError": {
-    "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+    "message": "No se puede acceder a los elementos que pertenecen a organizaciones que estén deshabilitadas. Por favor, póngase en contacto con el propietario de la organización para obtener ayuda."
   },
   "licenseIsExpired": {
     "message": "Licencia expirada."
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "Deshabilitado"
   },
-  "deactivated": {
-    "message": "Desactivado"
+  "revoked": {
+    "message": "Revocado"
   },
   "sendLink": {
     "message": "Enlace Send",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "¿Está seguro que desea eliminar los siguientes usuarios? El proceso puede tardar unos segundos en completarse y no puede interrumpirse o cancelarse."
   },
-  "deactivateUsersWarning": {
-    "message": "Are you sure you want to deactivate the following members? They will no longer have access to the organization, but will still have access to their individual vaults. The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "removeOrgUsersConfirmation": {
+    "message": "Cuando los miembros de una organización son eliminados, ya no tienen acceso a los datos de la misma siendo esta acción irreversible. Para añadir a un miembro de vuelta a la organización, debe ser invitado e incorporado a la misma de nuevo. El proceso puede tardar unos segundos en completarse y no se puede interrumpir o cancelar."
   },
-  "activateUsersWarning": {
-    "message": "Are you sure you want to activate the following members, granting them access to the organization? The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "revokeUsersWarning": {
+    "message": "Cuando los miembros de una organización son revocados, ya no tienen acceso a los datos de la misma. Para restaurar rápidamente el acceso de los miembros, vaya a la pestaña Revocado. El proceso puede tardar unos segundos en completarse y no se puede interrumpir o cancelar."
   },
   "theme": {
     "message": "Tema"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "Eliminado con éxito"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Desactivado correctamente"
+  "bulkRevokedMessage": {
+    "message": "Acceso a la organización revocado con éxito"
   },
-  "bulkActivatedMessage": {
-    "message": "Activado correctamente"
+  "bulkRestoredMessage": {
+    "message": "Acceso a la organización restaurado con éxito"
   },
   "bulkFilteredMessage": {
     "message": "Excluido, no aplicable a esta acción."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "Eliminar usuarios"
   },
-  "deactivateUsers": {
-    "message": "Desactivar usuarios"
+  "revokeUsers": {
+    "message": "Revocar usuarios"
   },
-  "activateUsers": {
-    "message": "Activar usuarios"
+  "restoreUsers": {
+    "message": "Restaurar usuarios"
   },
   "error": {
     "message": "Error"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Patrocinio creado"
   },
-  "revoke": {
-    "message": "Revocar"
-  },
   "emailSent": {
     "message": "Correo electrónico enviado"
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "Aprovisionamiento de SCIM",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Activar SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Set up your preferred identity provider by configuring the URL and SCIM API Key",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "This API key has access to manage users within your organization. It should be kept secret."
+  },
+  "copyScimKey": {
+    "message": "Copy the SCIM API Key to your clipboard",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Rotar la clave API SCIM",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "¿Está seguro de que desea rotar la clave API SCIM? La clave actual no funcionará para ninguna integración existente.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Rotar clave"
+  },
+  "scimApiKey": {
+    "message": "Clave API SCIM",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Copy the SCIM endpoint URL to your clipboard",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "URL SCIM",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "La clave de API de SCIM se ha rotado correctamente",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "Los ajustes de SCIM se han guardado correctamente",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Entrada requerida."
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "Activado"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/et/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "Sinu konto on loodud! Saad nüüd sellesse sisse logida."
   },
+  "trialAccountCreated": {
+    "message": "Konto on edukalt loodud."
+  },
   "masterPassSent": {
     "message": "Ülemparooli vihje saadeti sinu e-posti aadressile."
   },
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "Sisselülitatud"
   },
-  "activate": {
-    "message": "Aktiveeri"
+  "restoreAccess": {
+    "message": "Taasta ligipääsu luba"
   },
   "premium": {
     "message": "Premium",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "Keela"
   },
-  "deactivate": {
-    "message": "Deaktiveeri"
+  "revokeAccess": {
+    "message": "Tühistada ligipääsu luba"
   },
   "twoStepLoginProviderEnabled": {
     "message": "See kaheastmelise kinnitamise teenus on sinu kontol sisse lülitatud."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "Maksmine"
   },
+  "billingPlanLabel": {
+    "message": "Tellimus"
+  },
+  "paymentType": {
+    "message": "Makse tüüp"
+  },
   "accountCredit": {
     "message": "Konto krediit",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "aasta"
   },
+  "yr": {
+    "message": "a"
+  },
   "month": {
     "message": "kuu"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Arveldusandmed"
   },
+  "billingTrialSubLabel": {
+    "message": "7 päevase prooviperioodi sees maksemeetodit ei kasutata."
+  },
   "creditCard": {
     "message": "Krediitkaart"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Täname, et soetasid Bitwarden $PLAN$'i!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "$PLAN$ tasuta 7 päevane versioon muutub automaatselt pärast 7-ndat päeva tasuliseks.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "Saatsime kinnituskirja sinu tiimi arve e-postile "
+  },
   "monthly": {
     "message": "Igakuiselt"
   },
   "annually": {
     "message": "Tasumine aasta kaupa"
   },
+  "annual": {
+    "message": "Aastane"
+  },
   "basePrice": {
     "message": "Baashind"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "Tahad kindlasti selle kasutaja eemaldada?"
   },
-  "deactivateUserConfirmation": {
-    "message": "Liige ei pääse enam organisatsiooni hoidlale ligi. Küll aga säilitab ta ligipääsu oma individuaalsele hoidlale."
+  "removeOrgUserConfirmation": {
+    "message": "Pärast kasutaja eemaldamist ei saa ta enam organisatsiooni andmetele ligi. Seda tegevust ei saa tagasi võtta. Selleks, et kasutaja uuesti organisatsiooniga liita, peab talle esitama kutse. Sellega koos on vaja läbi teha kogu liitumise protsess."
   },
-  "activateUserConfirmation": {
-    "message": "Oled kindel, et soovid seda kasutajat aktiveerida ja anda talle ligipääs organisatsioonile?"
+  "revokeUserConfirmation": {
+    "message": "Kui kasutaja ligipääsu luba on tühistatud, ei saa ta enam origanisatsiooni andmetele ligi. Ligipääsu taastamiseks ava \"Tühistatud\" kaart."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Warning! This user requires Key Connector to manage their encryption. Removing this user from your organization will permanently disable their account. This action cannot be undone. Do you want to proceed?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Kasutaja $ID$ on deaktiveeritud.",
+  "removeUserIdAccess": {
+    "message": "Eemalda $ID$ ligipääs",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Kasutaja $ID$ on aktiveeritud.",
+  "revokedUserId": {
+    "message": "Revoked organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Deaktiveerin kasutaja $ID$?",
+  "restoredUserId": {
+    "message": "Restored organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Aktiveerin kasutaja $ID$?",
+  "revokeUserId": {
+    "message": "Revoke $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "Keelatud"
   },
-  "deactivated": {
-    "message": "Deaktiveeritud"
+  "revoked": {
+    "message": "Revoked"
   },
   "sendLink": {
     "message": "Sendi link",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "Oled kindel, et soovid järgnevaid kasutajaid eemaldada? See tegevus võib võtta paar sekundit ning seda ei saa katkestada."
   },
-  "deactivateUsersWarning": {
-    "message": "Oled kindel, et soovid järgnevad kasutajad deaktiveerida? Selle tulemusel ei pääse nad enam organisatsiooni ligi, aga säilitavad siiski ligipääsud oma isiklikele hoidlatele. See protsess võtab mõned sekundid ning seda ei saa tühistada."
+  "removeOrgUsersConfirmation": {
+    "message": "When member(s) are removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "activateUsersWarning": {
-    "message": "Oled kindel, et soovid järgnevatele kasutajatele anda ligipääsu organisatsioonile? See tegevus võib võtta paar sekundit ning seda ei saa katkestada."
+  "revokeUsersWarning": {
+    "message": "When member(s) are revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
   "theme": {
     "message": "Teema"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "Edukalt eemaldatud"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Edukalt deaktiveeritud"
+  "bulkRevokedMessage": {
+    "message": "Revoked organization access successfully"
   },
-  "bulkActivatedMessage": {
-    "message": "Edukalt aktiveeritud"
+  "bulkRestoredMessage": {
+    "message": "Restored organization access successfully"
   },
   "bulkFilteredMessage": {
     "message": "Välja jäetud, ei rakendu sellel tegevuse puhul."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "Kasutajate eemaldamine"
   },
-  "deactivateUsers": {
-    "message": "Kasutajate deaktiveerimine"
+  "revokeUsers": {
+    "message": "Revoke Users"
   },
-  "activateUsers": {
-    "message": "Kasutajate aktiveerimine"
+  "restoreUsers": {
+    "message": "Restore Users"
   },
   "error": {
     "message": "Viga"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Sponsorship Created"
   },
-  "revoke": {
-    "message": "Revoke"
-  },
   "emailSent": {
     "message": "E-kiri on saadetud"
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "SCIM Provisioning",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Enable SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Set up your preferred identity provider by configuring the URL and SCIM API Key",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "This API key has access to manage users within your organization. It should be kept secret."
+  },
+  "copyScimKey": {
+    "message": "Copy the SCIM API Key to your clipboard",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Rotate the SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Are you sure you want to rotate the SCIM API Key? The current key will no longer work for any existing integrations.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Rotate Key"
+  },
+  "scimApiKey": {
+    "message": "SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Copy the SCIM endpoint URL to your clipboard",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "SCIM URL",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "The SCIM API Key has been successfully rotated",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "SCIM settings have been saved successfully",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Sisestus on nõutav."
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "On"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/fi/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "Uusi käyttäjätilisi on luotu! Voit nyt kirjautua sisään."
   },
+  "trialAccountCreated": {
+    "message": "Tilin luonti onnistui."
+  },
   "masterPassSent": {
     "message": "Lähetimme pääsalasanasi vihjeen sähköpostitse."
   },
@@ -1103,7 +1106,7 @@
     "message": "Tiedoissa, joita yritit tuoda, havaittiin ongelma. Korjaa alla listatut virheet lähdetiedostosta ja yritä uudelleen."
   },
   "importSuccess": {
-    "message": "Tietojen tuonti holviisi onnistui."
+    "message": "Tietojen tuonti holviin onnistui."
   },
   "importWarning": {
     "message": "Olet tuomassa tietoja organisaatioon $ORGANIZATION$. Tietojasi saatetaan jakaa organisaation jäsenten kesken. Haluatko jatkaa?",
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "Käytössä"
   },
-  "activate": {
-    "message": "Aktivoi"
+  "restoreAccess": {
+    "message": "Palauta käyttöoikeus"
   },
   "premium": {
     "message": "Premium",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "Poista käytöstä"
   },
-  "deactivate": {
-    "message": "Deaktivoi"
+  "revokeAccess": {
+    "message": "Peru käyttöoikeus"
   },
   "twoStepLoginProviderEnabled": {
     "message": "Tämä kaksivaiheisen kirjautumisen todentaja on käytössä tililläsi."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "Laskutus"
   },
+  "billingPlanLabel": {
+    "message": "Laskutussuunnitelma"
+  },
+  "paymentType": {
+    "message": "Maksun tyyppi"
+  },
   "accountCredit": {
     "message": "Tilin saldo",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "vuosi"
   },
+  "yr": {
+    "message": "v"
+  },
   "month": {
     "message": "kuukausi"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Laskutustiedot"
   },
+  "billingTrialSubLabel": {
+    "message": "Maksutapaasi ei veloiteta 7 päivän kokeilujakson aikana."
+  },
   "creditCard": {
     "message": "Maksukortti"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Kiitos Bitwarden $PLAN$ -tilauksesta!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "$PLAN$-tilauksesi 7 päivän kokeilujakso muutetaan 7 päivän kuluttua maksulliseksi tilaukseksi.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "Olemme lähettäneet tiimillesi vahvistussähköpostin osoitteeseen "
+  },
   "monthly": {
     "message": "Kuukausittainen"
   },
   "annually": {
     "message": "Vuotuinen"
   },
+  "annual": {
+    "message": "Vuotuinen"
+  },
   "basePrice": {
     "message": "Lähtöhinta"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "Haluatko varmasti poistaa käyttäjän?"
   },
-  "deactivateUserConfirmation": {
-    "message": "Jäsenellä ei ole enää organisaation käyttöoikeutta, mutta hän voi edelleen käyttää henkilökohtaista hoviaan."
+  "removeOrgUserConfirmation": {
+    "message": "Kun jäsen poistetaan, hänellä ei ole enää pääsyä organisaation tietoihin, eikä poistoa ole mahdollista perua. Jos haluat lisätä jäsenen takaisin organisaatioon, hänet on kutsuttava ja perehdytettävä uudelleen."
   },
-  "activateUserConfirmation": {
-    "message": "Haluatko varmasti aktivoida käyttäjän ja myöntää hänelle käyttöoikeuden organisaatioon?"
+  "revokeUserConfirmation": {
+    "message": "Kun jäsenen käyttöoikeus perutaan, hänellä ei ole enää pääsyä organisaation tietoihin. Voit palauttaa käyttöoikeuden nopeasti Perutut-välilehdeltä."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Varoitus! Tämä käyttäjä tarvitsee salauksensa hallintaan Key Connectoria. Käyttäjän poistaminen organisaatiostasi poistaa heidän tilinsä käytöstä pysvästi. Toimenpide on pysyvä, eikä sen peruminen ole mahdollista. Haluatko jatkaa?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Käyttäjä $ID$ on deaktivoitu.",
+  "removeUserIdAccess": {
+    "message": "Poista jäsenen $ID$ käyttöoikeus",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Käyttäjä $ID$ on aktivoitu.",
+  "revokedUserId": {
+    "message": "Jäsenen $ID$ organisaation käyttöoikeus on peruttu.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Deaktivoidaanko käyttäjä $ID$?",
+  "restoredUserId": {
+    "message": "Jäsenen $ID$ organisaation käyttöoikeus on palautettu.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Aktivoidaanko käyttäjä $ID$?",
+  "revokeUserId": {
+    "message": "Peru jäsenen $ID$ käyttöoikeus",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "Poistettu käytöstä"
   },
-  "deactivated": {
-    "message": "Deaktivoitu"
+  "revoked": {
+    "message": "Perutut"
   },
   "sendLink": {
     "message": "Send-linkki",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "Haluatko varmasti poistaa seuraavat käyttäjät? Toiminto saattaa kestää muutamia sekunteja, eikä sen keskeytys tai peruminen ole mahdollista."
   },
-  "deactivateUsersWarning": {
-    "message": "Haluatko varmasti deaktivoida seuraavat käyttäjät? Heillä ei enää ole organisaation käyttöoikeutta, mutta he voivat edelleen käyttää henkilökohtaisia holvejaan. Toiminto saattaa kestää muutamia sekunteja, eikä sen keskeytys tai peruminen ole mahdollista."
+  "removeOrgUsersConfirmation": {
+    "message": "Kun jäseniä poistetaan, heillä ei ole enää pääsyä organisaation tietoihin, eikä poistoa ole mahdollista perua. Jos haluat lisätä jäsenen takaisin organisaatioon, hänet on kutsuttava ja perehdytettävä uudelleen. Käsittely voi kestää muutamia sekunteja, eikä sitä ole mahdollista keskeyttää tai perua."
   },
-  "activateUsersWarning": {
-    "message": "Haluatko varmasti aktivoida seuraavat käyttäjät ja myöntää heille käyttöoikeuden organisaatioon? Toiminto saattaa kestää muutamia sekunteja, eikä sitä ole mahdollista keskeyttää tai perua."
+  "revokeUsersWarning": {
+    "message": "Kun jäsenien käyttöoikeus perutaan, heillä ei ole enää pääsyä organisaation tietoihin. Voit palauttaa käyttöoikeudet nopeasti Perutut-välilehdeltä. Käsittely voi kestää muutamia sekunteja, eikä sitä ole mahdollista keskeyttää tai perua."
   },
   "theme": {
     "message": "Teema"
@@ -4316,19 +4355,19 @@
     "message": "Joukkotoiminnon tila"
   },
   "bulkConfirmMessage": {
-    "message": "Vahvistettu onnistuneesti."
+    "message": "Vahvistus onnistui."
   },
   "bulkReinviteMessage": {
-    "message": "Kutsuttu uudelleen onnistuneesti."
+    "message": "Uuudelleenkutsu onnistui."
   },
   "bulkRemovedMessage": {
-    "message": "Poistettu onnistuneesti."
+    "message": "Poisto onnistui."
   },
-  "bulkDeactivatedMessage": {
-    "message": "Deaktivointi onnistui"
+  "bulkRevokedMessage": {
+    "message": "Organisaation käyttöoikeuden peruminen onnistui"
   },
-  "bulkActivatedMessage": {
-    "message": "Aktivointi onnistui"
+  "bulkRestoredMessage": {
+    "message": "Organisaation käyttöoikeuden palautus onnistui"
   },
   "bulkFilteredMessage": {
     "message": "Ohitettu, ei koske tätä toimintoa."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "Poista käyttäjiä"
   },
-  "deactivateUsers": {
-    "message": "Deaktivoi käyttäjät"
+  "revokeUsers": {
+    "message": "Peru jäsenien käyttöoikeudet"
   },
-  "activateUsers": {
-    "message": "Aktivoi käyttäjät"
+  "restoreUsers": {
+    "message": "Palauta jäsenien käyttöoikeudet"
   },
   "error": {
     "message": "Virhe"
@@ -4428,7 +4467,7 @@
     }
   },
   "organizationJoinedProvider": {
-    "message": "Organisaatio lisättiin todentajaan onnistuneesti"
+    "message": "Organisaation lisäys todentajaan onnistui"
   },
   "accessingUsingProvider": {
     "message": "Käytetään organisaatiota todentajalla $PROVIDER$",
@@ -4711,7 +4750,7 @@
     "message": "Hyväksy ilmainen Bitwarden Perheille"
   },
   "sponsoredFamiliesOfferRedeemed": {
-    "message": "Ilmainen Bitwarden Perheille -tarjous on lunastettu"
+    "message": "Ilmaisen Bitwarden Perheille -tarjouksen lunastus onnistui"
   },
   "redeemed": {
     "message": "Lunastettu"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Sponsorointi on luotu"
   },
-  "revoke": {
-    "message": "Irtisano"
-  },
   "emailSent": {
     "message": "Sähköposti on lähetetty"
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "SCIM-provisiointi",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Provisioi käyttäjät ja ryhmät suosimasi tunnistustietojen tarjoajan kanssa SCIM-provisioinnilla",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Ota SCIM käyttöön",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Määritä haluamasi SAML-tunnistustietojen tarjoaja määrittämällä URL-osoite ja SCIM API-avain",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "Tällä API-avaimella on oikeus hallita organisaation käyttäjiä. Se tulee pitää salassa."
+  },
+  "copyScimKey": {
+    "message": "Kopioi SCIM API-avain leikepöydälle",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Uudista SCIM API-avain",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Haluatko varmasti uudistaa SCIM API-avaimen? Nykyinen avain ei enää toimi olemassa oleville integraatioille.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Uudista avain"
+  },
+  "scimApiKey": {
+    "message": "SCIM API-avain",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Kopioi SCIM-päätteen URL-osoite leikepöydälle",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "SCIM URL",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "SCIM API-avaimen uudistus onnistui",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "SCIM-asetusten tallennus onnistui",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Syöte vaaditaan."
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "Käytössä"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/fil/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "Your new account has been created! You may now log in."
   },
+  "trialAccountCreated": {
+    "message": "Account created successfully."
+  },
   "masterPassSent": {
     "message": "We've sent you an email with your master password hint."
   },
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "Enabled"
   },
-  "activate": {
-    "message": "Activate"
+  "restoreAccess": {
+    "message": "Restore Access"
   },
   "premium": {
     "message": "Premium",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "Disable"
   },
-  "deactivate": {
-    "message": "Deactivate"
+  "revokeAccess": {
+    "message": "Revoke Access"
   },
   "twoStepLoginProviderEnabled": {
     "message": "This two-step login provider is enabled on your account."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "Billing"
   },
+  "billingPlanLabel": {
+    "message": "Billing Plan"
+  },
+  "paymentType": {
+    "message": "Payment Type"
+  },
   "accountCredit": {
     "message": "Account Credit",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "year"
   },
+  "yr": {
+    "message": "yr"
+  },
   "month": {
     "message": "month"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Billing Information"
   },
+  "billingTrialSubLabel": {
+    "message": "Your payment method will not be charged during the 7 day free trial."
+  },
   "creditCard": {
     "message": "Credit Card"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Thanks for signing up for Bitwarden for $PLAN$!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "Your $PLAN$ 7 day free trial will be converted to a paid subscription after 7 days.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "We've sent a confirmation email to your team's billing email at "
+  },
   "monthly": {
     "message": "Monthly"
   },
   "annually": {
     "message": "Annually"
   },
+  "annual": {
+    "message": "Annual"
+  },
   "basePrice": {
     "message": "Base Price"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "Are you sure you want to remove this user?"
   },
-  "deactivateUserConfirmation": {
-    "message": "The member will no longer have access to the organization, but will still have access to their individual vault."
+  "removeOrgUserConfirmation": {
+    "message": "When a member is removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again."
   },
-  "activateUserConfirmation": {
-    "message": "Are you sure you want to activate this user, granting them access to the organization?"
+  "revokeUserConfirmation": {
+    "message": "When a member is revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Warning! This user requires Key Connector to manage their encryption. Removing this user from your organization will permanently disable their account. This action cannot be undone. Do you want to proceed?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Deactivated user $ID$.",
+  "removeUserIdAccess": {
+    "message": "Remove $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Activated user $ID$.",
+  "revokedUserId": {
+    "message": "Revoked organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Deactivate user $ID$?",
+  "restoredUserId": {
+    "message": "Restored organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Activate user $ID$?",
+  "revokeUserId": {
+    "message": "Revoke $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "Disabled"
   },
-  "deactivated": {
-    "message": "Deactivated"
+  "revoked": {
+    "message": "Revoked"
   },
   "sendLink": {
     "message": "Send link",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "Are you sure you want to remove the following users? The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "deactivateUsersWarning": {
-    "message": "Are you sure you want to deactivate the following members? They will no longer have access to the organization, but will still have access to their individual vaults. The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "removeOrgUsersConfirmation": {
+    "message": "When member(s) are removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "activateUsersWarning": {
-    "message": "Are you sure you want to activate the following members, granting them access to the organization? The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "revokeUsersWarning": {
+    "message": "When member(s) are revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
   "theme": {
     "message": "Theme"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "Removed successfully"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Deactivated successfully"
+  "bulkRevokedMessage": {
+    "message": "Revoked organization access successfully"
   },
-  "bulkActivatedMessage": {
-    "message": "Activated successfully"
+  "bulkRestoredMessage": {
+    "message": "Restored organization access successfully"
   },
   "bulkFilteredMessage": {
     "message": "Excluded, not applicable for this action."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "Remove Users"
   },
-  "deactivateUsers": {
-    "message": "Deactivate Users"
+  "revokeUsers": {
+    "message": "Revoke Users"
   },
-  "activateUsers": {
-    "message": "Activate Users"
+  "restoreUsers": {
+    "message": "Restore Users"
   },
   "error": {
     "message": "Error"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Sponsorship Created"
   },
-  "revoke": {
-    "message": "Revoke"
-  },
   "emailSent": {
     "message": "Email Sent"
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "SCIM Provisioning",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Enable SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Set up your preferred identity provider by configuring the URL and SCIM API Key",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "This API key has access to manage users within your organization. It should be kept secret."
+  },
+  "copyScimKey": {
+    "message": "Copy the SCIM API Key to your clipboard",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Rotate the SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Are you sure you want to rotate the SCIM API Key? The current key will no longer work for any existing integrations.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Rotate Key"
+  },
+  "scimApiKey": {
+    "message": "SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Copy the SCIM endpoint URL to your clipboard",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "SCIM URL",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "The SCIM API Key has been successfully rotated",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "SCIM settings have been saved successfully",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Input is required."
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "On"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/fr/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "Votre nouveau compte a été créé ! Vous pouvez maintenant vous authentifier."
   },
+  "trialAccountCreated": {
+    "message": "Compte créé avec succès."
+  },
   "masterPassSent": {
     "message": "Nous vous avons envoyé un e-mail contenant votre indice de mot de passe maître."
   },
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "Activé"
   },
-  "activate": {
-    "message": "Activer"
+  "restoreAccess": {
+    "message": "Restaurer l'Accès"
   },
   "premium": {
     "message": "Premium",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "Désactiver"
   },
-  "deactivate": {
-    "message": "Désactiver"
+  "revokeAccess": {
+    "message": "Révoquer l'Accès"
   },
   "twoStepLoginProviderEnabled": {
     "message": "Ce fournisseur de connexion en deux étapes est activé sur votre compte."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "Facturation"
   },
+  "billingPlanLabel": {
+    "message": "Plan de Facturation"
+  },
+  "paymentType": {
+    "message": "Type de Paiement"
+  },
   "accountCredit": {
     "message": "Compte créditeur",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "an"
   },
+  "yr": {
+    "message": "an"
+  },
   "month": {
     "message": "mois"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Informations de facturation"
   },
+  "billingTrialSubLabel": {
+    "message": "Votre mode de paiement ne sera pas débité pendant la période d'essai gratuite de 7 jours."
+  },
   "creditCard": {
     "message": "Carte de crédit"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Merci de vous être inscrit à Bitwarden avec le $PLAN$!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "Votre essai gratuit de 7 jours à $PLAN$ sera converti en un abonnement payant après 7 jours.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "Nous avons envoyé un e-mail de confirmation à l'adresse e-mail de facturation de votre équipe à "
+  },
   "monthly": {
     "message": "Mensuel"
   },
   "annually": {
     "message": "Annuel"
   },
+  "annual": {
+    "message": "Annuel"
+  },
   "basePrice": {
     "message": "Prix de base"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "Êtes-vous sûr de vouloir retirer cet utilisateur ?"
   },
-  "deactivateUserConfirmation": {
-    "message": "Le membre n'aura plus accès à l'organisation, mais aura toujours accès à son coffre individuel."
+  "removeOrgUserConfirmation": {
+    "message": "Lorsqu'un membre est supprimé, il n'a plus accès aux données de l'organisation et cette action est irréversible. Pour ajouter de nouveau le membre à l'organisation, il doit être invité et inscrit à nouveau."
   },
-  "activateUserConfirmation": {
-    "message": "Êtes-vous sûr de vouloir activer cet utilisateur ; cela lui donne accès à l'organisation?"
+  "revokeUserConfirmation": {
+    "message": "Lorsqu'un membre est révoqué, il n'a plus accès aux données de l'organisation. Pour restaurer rapidement l'accès des membres, allez dans l'onglet Révoqué."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Attention ! Cet utilisateur a besoin de Key Connector pour gérer son chiffrement. Supprimer cet utilisateur de votre organisation désactivera définitivement son compte. Cette action ne peut pas être annulée. Voulez-vous continuer?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Utilisateur désactivé $ID$.",
+  "removeUserIdAccess": {
+    "message": "Retirer l'accès à $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Utilisateur activé $ID$.",
+  "revokedUserId": {
+    "message": "Accès à l'organisation révoqué pour $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Désactiver l'utilisateur $ID$?",
+  "restoredUserId": {
+    "message": "Accès à l'organisation restauré pour $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Activer l'utilisateur $ID$?",
+  "revokeUserId": {
+    "message": "Révoquer l'accès à $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3219,7 +3258,7 @@
     "message": "L'organisation est désactivée."
   },
   "disabledOrganizationFilterError": {
-    "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+    "message": "Les éléments des Organisations désactivées ne sont pas accessibles. Contactez le propriétaire de votre Organisation pour obtenir de l'aide."
   },
   "licenseIsExpired": {
     "message": "La licence a expiré."
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "Désactivé"
   },
-  "deactivated": {
-    "message": "Désactivé"
+  "revoked": {
+    "message": "Révoqué"
   },
   "sendLink": {
     "message": "Lien du Send",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "Êtes-vous sûr de vouloir supprimer les utilisateurs suivants ? Le processus peut prendre quelques secondes et ne peut être interrompu ou annulé."
   },
-  "deactivateUsersWarning": {
-    "message": "Êtes-vous sûr de vouloir désactiver les membres suivants? Ils n'auront plus accès à l'organisation, mais auront toujours accès à leurs coffres individuels. Le processus peut prendre quelques secondes et ne peut pas être interrompu ou annulé."
+  "removeOrgUsersConfirmation": {
+    "message": "Lorsque les membres sont supprimés, ils n'ont plus accès aux données de l'organisation et cette action est irréversible. Pour ajouter de nouveau ces membres à l'organisation, ils doivent être invités et inscrit à nouveau. Le processus peut prendre quelques secondes et ne peut pas être interrompu ou annulé."
   },
-  "activateUsersWarning": {
-    "message": "Êtes-vous sûr de vouloir activer les membres suivants, leur donnant accès à l'organisation? Le processus peut prendre quelques secondes et ne peut pas être interrompu ou annulé."
+  "revokeUsersWarning": {
+    "message": "Lorsque les membres sont révoqués, ils n'ont plus accès aux données de l'organisation. Pour restaurer rapidement l'accès des membres, allez dans l'onglet Révoqué. Le processus peut prendre quelques secondes et ne peut pas être interrompu ou annulé."
   },
   "theme": {
     "message": "Thème"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "Supprimé avec succès"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Désactivé avec succès"
+  "bulkRevokedMessage": {
+    "message": "Accès à l'organisation révoqué avec succès"
   },
-  "bulkActivatedMessage": {
-    "message": "Activé avec succès"
+  "bulkRestoredMessage": {
+    "message": "Accès à l'organisation restauré avec succès"
   },
   "bulkFilteredMessage": {
     "message": "Exclu, non applicable pour cette action."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "Supprimer les utilisateurs"
   },
-  "deactivateUsers": {
-    "message": "Désactiver les Utilisateurs"
+  "revokeUsers": {
+    "message": "Révoquer les Utilisateurs"
   },
-  "activateUsers": {
-    "message": "Activer les Utilisateurs"
+  "restoreUsers": {
+    "message": "Restaurer les Utilisateurs"
   },
   "error": {
     "message": "Erreur"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Parrainage créé"
   },
-  "revoke": {
-    "message": "Révoquer"
-  },
   "emailSent": {
     "message": "E-mail envoyé"
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "Provisionnement SCIM",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Fournit automatiquement aux utilisateurs et aux groupes votre fournisseur d'identité préféré via l'approvisionnement SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Activer SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Configurez votre fournisseur d'identité préféré en configurant l'URL et la Clé d'API SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "Cette clé d'API a accès à la gestion des utilisateurs au sein de votre organisation. Elle doit être gardée secrète."
+  },
+  "copyScimKey": {
+    "message": "Copiez la Clé d'API SCIM dans votre presse-papiers",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Pivoter la Clé d'API SCIM",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Êtes-vous sûr de vouloir pivoter la Clé d'API SCIM ? La clé actuelle ne fonctionnera plus pour aucune intégration existante.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Pivoter la Clé"
+  },
+  "scimApiKey": {
+    "message": "Clé d'API SCIM",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Copiez l'URL du point de terminaison SCIM dans votre presse-papiers",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "URL SCIM",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "La clé d'API SCIM a été pivotée avec succès",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "Les paramètres SCIM ont été enregistrés avec succès",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Entrée requise."
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "Activé"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/he/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "החשבון החדש שלך נוצר בהצלחה! כעת ניתן להתחבר למערכת."
   },
+  "trialAccountCreated": {
+    "message": "Account created successfully."
+  },
   "masterPassSent": {
     "message": "שלחנו לך אימייל עם רמז לסיסמה הראשית."
   },
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "מופעל"
   },
-  "activate": {
-    "message": "Activate"
+  "restoreAccess": {
+    "message": "Restore Access"
   },
   "premium": {
     "message": "פרימיום",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "בטל"
   },
-  "deactivate": {
-    "message": "Deactivate"
+  "revokeAccess": {
+    "message": "Revoke Access"
   },
   "twoStepLoginProviderEnabled": {
     "message": "ספק כניסה דו-שלבית זה נתמך בחשבון שלך."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "חיוב"
   },
+  "billingPlanLabel": {
+    "message": "Billing Plan"
+  },
+  "paymentType": {
+    "message": "Payment Type"
+  },
   "accountCredit": {
     "message": "מאזן החשבון",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "שנה"
   },
+  "yr": {
+    "message": "yr"
+  },
   "month": {
     "message": "חודש"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Billing Information"
   },
+  "billingTrialSubLabel": {
+    "message": "Your payment method will not be charged during the 7 day free trial."
+  },
   "creditCard": {
     "message": "כרטיס אשראי"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Thanks for signing up for Bitwarden for $PLAN$!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "Your $PLAN$ 7 day free trial will be converted to a paid subscription after 7 days.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "We've sent a confirmation email to your team's billing email at "
+  },
   "monthly": {
     "message": "חודשי"
   },
   "annually": {
     "message": "שנתי"
   },
+  "annual": {
+    "message": "Annual"
+  },
   "basePrice": {
     "message": "מחיר בסיסי"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "האם אתה בטוח שברצונך להסיר משתמש זה?"
   },
-  "deactivateUserConfirmation": {
-    "message": "The member will no longer have access to the organization, but will still have access to their individual vault."
+  "removeOrgUserConfirmation": {
+    "message": "When a member is removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again."
   },
-  "activateUserConfirmation": {
-    "message": "Are you sure you want to activate this user, granting them access to the organization?"
+  "revokeUserConfirmation": {
+    "message": "When a member is revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Warning! This user requires Key Connector to manage their encryption. Removing this user from your organization will permanently disable their account. This action cannot be undone. Do you want to proceed?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Deactivated user $ID$.",
+  "removeUserIdAccess": {
+    "message": "Remove $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Activated user $ID$.",
+  "revokedUserId": {
+    "message": "Revoked organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Deactivate user $ID$?",
+  "restoredUserId": {
+    "message": "Restored organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Activate user $ID$?",
+  "revokeUserId": {
+    "message": "Revoke $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "מבוטל"
   },
-  "deactivated": {
-    "message": "Deactivated"
+  "revoked": {
+    "message": "Revoked"
   },
   "sendLink": {
     "message": "לינק לSend",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "Are you sure you want to remove the following users? The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "deactivateUsersWarning": {
-    "message": "Are you sure you want to deactivate the following members? They will no longer have access to the organization, but will still have access to their individual vaults. The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "removeOrgUsersConfirmation": {
+    "message": "When member(s) are removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "activateUsersWarning": {
-    "message": "Are you sure you want to activate the following members, granting them access to the organization? The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "revokeUsersWarning": {
+    "message": "When member(s) are revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
   "theme": {
     "message": "Theme"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "Removed successfully"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Deactivated successfully"
+  "bulkRevokedMessage": {
+    "message": "Revoked organization access successfully"
   },
-  "bulkActivatedMessage": {
-    "message": "Activated successfully"
+  "bulkRestoredMessage": {
+    "message": "Restored organization access successfully"
   },
   "bulkFilteredMessage": {
     "message": "Excluded, not applicable for this action."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "Remove Users"
   },
-  "deactivateUsers": {
-    "message": "Deactivate Users"
+  "revokeUsers": {
+    "message": "Revoke Users"
   },
-  "activateUsers": {
-    "message": "Activate Users"
+  "restoreUsers": {
+    "message": "Restore Users"
   },
   "error": {
     "message": "Error"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Sponsorship Created"
   },
-  "revoke": {
-    "message": "Revoke"
-  },
   "emailSent": {
     "message": "Email Sent"
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "SCIM Provisioning",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Enable SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Set up your preferred identity provider by configuring the URL and SCIM API Key",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "This API key has access to manage users within your organization. It should be kept secret."
+  },
+  "copyScimKey": {
+    "message": "Copy the SCIM API Key to your clipboard",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Rotate the SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Are you sure you want to rotate the SCIM API Key? The current key will no longer work for any existing integrations.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Rotate Key"
+  },
+  "scimApiKey": {
+    "message": "SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Copy the SCIM endpoint URL to your clipboard",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "SCIM URL",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "The SCIM API Key has been successfully rotated",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "SCIM settings have been saved successfully",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Input is required."
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "On"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/hi/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "Your new account has been created! You may now log in."
   },
+  "trialAccountCreated": {
+    "message": "Account created successfully."
+  },
   "masterPassSent": {
     "message": "We've sent you an email with your master password hint."
   },
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "Enabled"
   },
-  "activate": {
-    "message": "Activate"
+  "restoreAccess": {
+    "message": "Restore Access"
   },
   "premium": {
     "message": "Premium",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "Disable"
   },
-  "deactivate": {
-    "message": "Deactivate"
+  "revokeAccess": {
+    "message": "Revoke Access"
   },
   "twoStepLoginProviderEnabled": {
     "message": "This two-step login provider is enabled on your account."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "Billing"
   },
+  "billingPlanLabel": {
+    "message": "Billing Plan"
+  },
+  "paymentType": {
+    "message": "Payment Type"
+  },
   "accountCredit": {
     "message": "Account Credit",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "year"
   },
+  "yr": {
+    "message": "yr"
+  },
   "month": {
     "message": "month"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Billing Information"
   },
+  "billingTrialSubLabel": {
+    "message": "Your payment method will not be charged during the 7 day free trial."
+  },
   "creditCard": {
     "message": "Credit Card"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Thanks for signing up for Bitwarden for $PLAN$!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "Your $PLAN$ 7 day free trial will be converted to a paid subscription after 7 days.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "We've sent a confirmation email to your team's billing email at "
+  },
   "monthly": {
     "message": "Monthly"
   },
   "annually": {
     "message": "Annually"
   },
+  "annual": {
+    "message": "Annual"
+  },
   "basePrice": {
     "message": "Base Price"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "Are you sure you want to remove this user?"
   },
-  "deactivateUserConfirmation": {
-    "message": "The member will no longer have access to the organization, but will still have access to their individual vault."
+  "removeOrgUserConfirmation": {
+    "message": "When a member is removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again."
   },
-  "activateUserConfirmation": {
-    "message": "Are you sure you want to activate this user, granting them access to the organization?"
+  "revokeUserConfirmation": {
+    "message": "When a member is revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Warning! This user requires Key Connector to manage their encryption. Removing this user from your organization will permanently disable their account. This action cannot be undone. Do you want to proceed?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Deactivated user $ID$.",
+  "removeUserIdAccess": {
+    "message": "Remove $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Activated user $ID$.",
+  "revokedUserId": {
+    "message": "Revoked organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Deactivate user $ID$?",
+  "restoredUserId": {
+    "message": "Restored organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Activate user $ID$?",
+  "revokeUserId": {
+    "message": "Revoke $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "Disabled"
   },
-  "deactivated": {
-    "message": "Deactivated"
+  "revoked": {
+    "message": "Revoked"
   },
   "sendLink": {
     "message": "Send link",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "Are you sure you want to remove the following users? The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "deactivateUsersWarning": {
-    "message": "Are you sure you want to deactivate the following members? They will no longer have access to the organization, but will still have access to their individual vaults. The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "removeOrgUsersConfirmation": {
+    "message": "When member(s) are removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "activateUsersWarning": {
-    "message": "Are you sure you want to activate the following members, granting them access to the organization? The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "revokeUsersWarning": {
+    "message": "When member(s) are revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
   "theme": {
     "message": "Theme"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "Removed successfully"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Deactivated successfully"
+  "bulkRevokedMessage": {
+    "message": "Revoked organization access successfully"
   },
-  "bulkActivatedMessage": {
-    "message": "Activated successfully"
+  "bulkRestoredMessage": {
+    "message": "Restored organization access successfully"
   },
   "bulkFilteredMessage": {
     "message": "Excluded, not applicable for this action."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "Remove Users"
   },
-  "deactivateUsers": {
-    "message": "Deactivate Users"
+  "revokeUsers": {
+    "message": "Revoke Users"
   },
-  "activateUsers": {
-    "message": "Activate Users"
+  "restoreUsers": {
+    "message": "Restore Users"
   },
   "error": {
     "message": "Error"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Sponsorship Created"
   },
-  "revoke": {
-    "message": "Revoke"
-  },
   "emailSent": {
     "message": "Email Sent"
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "SCIM Provisioning",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Enable SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Set up your preferred identity provider by configuring the URL and SCIM API Key",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "This API key has access to manage users within your organization. It should be kept secret."
+  },
+  "copyScimKey": {
+    "message": "Copy the SCIM API Key to your clipboard",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Rotate the SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Are you sure you want to rotate the SCIM API Key? The current key will no longer work for any existing integrations.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Rotate Key"
+  },
+  "scimApiKey": {
+    "message": "SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Copy the SCIM endpoint URL to your clipboard",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "SCIM URL",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "The SCIM API Key has been successfully rotated",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "SCIM settings have been saved successfully",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Input is required."
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "On"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/hr/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "Tvoj novi račun je kreiran! Sada se možeš prijaviti."
   },
+  "trialAccountCreated": {
+    "message": "Account created successfully."
+  },
   "masterPassSent": {
     "message": "Poslali smo e-poštu s podsjetnikom glavne lozinke."
   },
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "Omogućeno"
   },
-  "activate": {
-    "message": "Activate"
+  "restoreAccess": {
+    "message": "Restore Access"
   },
   "premium": {
     "message": "Premium",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "Onemogući"
   },
-  "deactivate": {
-    "message": "Deactivate"
+  "revokeAccess": {
+    "message": "Revoke Access"
   },
   "twoStepLoginProviderEnabled": {
     "message": "Ovaj pružatelj prijave u dva koraka je omogućen na tvojem računu."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "Naplata"
   },
+  "billingPlanLabel": {
+    "message": "Billing Plan"
+  },
+  "paymentType": {
+    "message": "Payment Type"
+  },
   "accountCredit": {
     "message": "Sredstva računa",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "godišnje"
   },
+  "yr": {
+    "message": "yr"
+  },
   "month": {
     "message": "mjesečno"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Podaci za dostavu računa"
   },
+  "billingTrialSubLabel": {
+    "message": "Your payment method will not be charged during the 7 day free trial."
+  },
   "creditCard": {
     "message": "Kreditna kartica"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Thanks for signing up for Bitwarden for $PLAN$!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "Your $PLAN$ 7 day free trial will be converted to a paid subscription after 7 days.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "We've sent a confirmation email to your team's billing email at "
+  },
   "monthly": {
     "message": "mjesečno"
   },
   "annually": {
     "message": "godišnje"
   },
+  "annual": {
+    "message": "Annual"
+  },
   "basePrice": {
     "message": "Osnovna cijena"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "Sigurno želiš ukoniti ovog korisnika?"
   },
-  "deactivateUserConfirmation": {
-    "message": "The member will no longer have access to the organization, but will still have access to their individual vault."
+  "removeOrgUserConfirmation": {
+    "message": "When a member is removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again."
   },
-  "activateUserConfirmation": {
-    "message": "Are you sure you want to activate this user, granting them access to the organization?"
+  "revokeUserConfirmation": {
+    "message": "When a member is revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Upozorenje! Ovaj korisnik koristi konektor za ključ kako bi upravljao svojim šifriranjem. Uklanjanjem korisnika iz tvoje organizacije korisnički će račun biti trajno onemogućen. Ovu opciju nije moguće opozvati. Sigurno želiš nastaviti?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Deactivated user $ID$.",
+  "removeUserIdAccess": {
+    "message": "Remove $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Activated user $ID$.",
+  "revokedUserId": {
+    "message": "Revoked organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Deactivate user $ID$?",
+  "restoredUserId": {
+    "message": "Restored organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Activate user $ID$?",
+  "revokeUserId": {
+    "message": "Revoke $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "Onemogućeno"
   },
-  "deactivated": {
-    "message": "Deactivated"
+  "revoked": {
+    "message": "Revoked"
   },
   "sendLink": {
     "message": "Veza na Send",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "Sigurno želiš ukloniti sljedeće korisnike? Ova radnja može potrajati i nije ga moguće prekinuti ili poništiti."
   },
-  "deactivateUsersWarning": {
-    "message": "Are you sure you want to deactivate the following members? They will no longer have access to the organization, but will still have access to their individual vaults. The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "removeOrgUsersConfirmation": {
+    "message": "When member(s) are removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "activateUsersWarning": {
-    "message": "Are you sure you want to activate the following members, granting them access to the organization? The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "revokeUsersWarning": {
+    "message": "When member(s) are revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
   "theme": {
     "message": "Tema"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "Uspješno uklonjeno"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Deactivated successfully"
+  "bulkRevokedMessage": {
+    "message": "Revoked organization access successfully"
   },
-  "bulkActivatedMessage": {
-    "message": "Activated successfully"
+  "bulkRestoredMessage": {
+    "message": "Restored organization access successfully"
   },
   "bulkFilteredMessage": {
     "message": "Isključeno, nije primijenjivo na ovu radnju."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "Ukloni korisnike"
   },
-  "deactivateUsers": {
-    "message": "Deactivate Users"
+  "revokeUsers": {
+    "message": "Revoke Users"
   },
-  "activateUsers": {
-    "message": "Activate Users"
+  "restoreUsers": {
+    "message": "Restore Users"
   },
   "error": {
     "message": "Greška"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Sponsorship Created"
   },
-  "revoke": {
-    "message": "Opozovi"
-  },
   "emailSent": {
     "message": "e-pošta poslana"
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "SCIM Provisioning",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Enable SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Set up your preferred identity provider by configuring the URL and SCIM API Key",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "This API key has access to manage users within your organization. It should be kept secret."
+  },
+  "copyScimKey": {
+    "message": "Copy the SCIM API Key to your clipboard",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Rotate the SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Are you sure you want to rotate the SCIM API Key? The current key will no longer work for any existing integrations.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Rotate Key"
+  },
+  "scimApiKey": {
+    "message": "SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Copy the SCIM endpoint URL to your clipboard",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "SCIM URL",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "The SCIM API Key has been successfully rotated",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "SCIM settings have been saved successfully",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Input is required."
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "On"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/hu/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "A fiók létrehozásra került. Most már be lehet jelentkezni."
   },
+  "trialAccountCreated": {
+    "message": "A fiók sikeresen létrejött."
+  },
   "masterPassSent": {
     "message": "A mesterjelszó emlékeztetőt tartalmazó email elküldésre került."
   },
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "Engedélyezve"
   },
-  "activate": {
-    "message": "Bekapcsolás"
+  "restoreAccess": {
+    "message": "Hozzáférés helyreállítás"
   },
   "premium": {
     "message": "Prémium",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "Letiltás"
   },
-  "deactivate": {
-    "message": "Kikapcsolás"
+  "revokeAccess": {
+    "message": "Hozzáférés visszavonása"
   },
   "twoStepLoginProviderEnabled": {
     "message": "Ez a kétlépéses bejelentkezés szolgáltató már engedélyezett a fiókon."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "Számlázás"
   },
+  "billingPlanLabel": {
+    "message": "Számlázási csomag"
+  },
+  "paymentType": {
+    "message": "Fizetési mód"
+  },
   "accountCredit": {
     "message": "Fiók  hitelkeret",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "év"
   },
+  "yr": {
+    "message": "év"
+  },
   "month": {
     "message": "hónap"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Számlázási adatok"
   },
+  "billingTrialSubLabel": {
+    "message": "A 7 napos ingyenes próbaidőszak alatt a fizetési mód nem kerül megterhelésre."
+  },
   "creditCard": {
     "message": "Hitelkártya"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Köszönet a regisztrációért a Bitwarden $PLAN$ csomagjára!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "$PLAN$ csomag 7 napos ingyenes próbaverziója fizetős feliratkozássá válik 7 nap után.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "A megerősítő email elküldésre került a csoport számlázási email címére:"
+  },
   "monthly": {
     "message": "Havi"
   },
   "annually": {
     "message": "Évente"
   },
+  "annual": {
+    "message": "Éves"
+  },
   "basePrice": {
     "message": "Alapár"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "Biztosan eltávolításra kerüljön ez a felhasználó?"
   },
-  "deactivateUserConfirmation": {
-    "message": "A tag a továbikban nem érheti el a szervezetet, de elérheti az egyedi széfjüket."
+  "removeOrgUserConfirmation": {
+    "message": "Ha egy tag eltávolításra kerül, többé nem fér hozzá a szervezet adataihoz és ez a művelet visszafordíthatatlan. Ha vissza szeretnénk adni a tagot a szervezethez, meg kell hívni és újra fel kell venni a kapcsolatot."
   },
-  "activateUserConfirmation": {
-    "message": "Biztosan szeretnénk bekapcsolni ezt a felhasználót hozzáférési joggal a szervezethez?"
+  "revokeUserConfirmation": {
+    "message": "Amikor egy tag visszavonásra kerül,  többé nem fér hozzá a szervezet adataihoz. A tagok hozzáférésének gyors visszaállításához lépjünk a Visszavont fülre."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Figyelem! Ennek a felhasználónak kulcskapcsolóra van szüksége a titkosítás kezeléséhez. Ha eltávolítjuk ezt a felhasználót a szervezetből, azzal véglegesen letiltjuk a fiókját. Ez a művelet nem visszavonható. Folytatás?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "$ID$ felhasználó kikapcsolásra került.",
+  "removeUserIdAccess": {
+    "message": "$ID$ hozzáférés visszavonás",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "$ID$ felhasználó bekapcsolásra került.",
+  "revokedUserId": {
+    "message": "$ID$ szervezeti hozzáférése visszavonásra került.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Kikapcsolásra kerüljön $ID$ felhasználó?",
+  "restoredUserId": {
+    "message": "$ID$ szervezeti hozzáférése helyreállításra került.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Bekapcsolásra kerüljön $ID$ felhasználó?",
+  "revokeUserId": {
+    "message": "$ID$ hozzáférés visszavonása",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "Letiltva"
   },
-  "deactivated": {
-    "message": "A kikapcsolás megtörtént."
+  "revoked": {
+    "message": "A visszavonás megtörtént."
   },
   "sendLink": {
     "message": "Send hivatkozás",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "Biztosan eltávolításra kerüljenek a következő felhasználók? A folyamat néhány másodpercet vehet igénybe és nem szakítható meg vagy törölhető."
   },
-  "deactivateUsersWarning": {
-    "message": "Biztosan kikapcsolásra kerüljenek a következő tagok? Többé nem férnek hozzá a szervezethez de továbbra is hozzáférhetnek az egyedi széfjükhöz. A folyamat befejezése néhány másodpercet vehet igénybe és nem szakítható meg vagy nem vonható vissza."
+  "removeOrgUsersConfirmation": {
+    "message": "A tagok eltávolítása után többé nem férnek hozzá a szervezet adataihoz és ez a művelet visszafordíthatatlan. Ha vissza szeretnénk adni a tagot a szervezethez, meg kell hívni és újra fel kell vennie a kapcsolatot. A folyamat néhány másodpercig tarthat és nem lehet megszakítani vagy törölni."
   },
-  "activateUsersWarning": {
-    "message": "Biztosan bekapcsolásra kerüljenek a következő tagok, lehetővé téve számukra a szervezet elérését? A folyamat befejezése néhány másodpercet vehet igénybe, és nem szakítható meg vagy nem vonható vissza."
+  "revokeUsersWarning": {
+    "message": "A tagok visszavonása után a továbbiakban nem férnek hozzá a szervezet adataihoz. A tagok hozzáférésének gyors visszaállításához lépjünk a Visszavont fülre. A folyamat néhány másodpercig tarthat és nem lehet megszakítani vagy törölni."
   },
   "theme": {
     "message": "Téma"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "Az eltávolítás sikeres volt."
   },
-  "bulkDeactivatedMessage": {
-    "message": "A kikapcsolás sikeresen megtörtént."
+  "bulkRevokedMessage": {
+    "message": "Sikeresen visszavonásra került a szervezeti hozzáférés."
   },
-  "bulkActivatedMessage": {
-    "message": "A bekapcsolás sikeresen megtörtént."
+  "bulkRestoredMessage": {
+    "message": "Sikeresen helyreállításra került a szervezeti hozzáférés."
   },
   "bulkFilteredMessage": {
     "message": "Kizárva, nem alkalmazható erre a műveletre."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "Felhasználók eltávolítása"
   },
-  "deactivateUsers": {
-    "message": "Felhasználók kikapcsolása"
+  "revokeUsers": {
+    "message": "Felhasználók visstavonása"
   },
-  "activateUsers": {
-    "message": "Felhasználók bekapcsolása"
+  "restoreUsers": {
+    "message": "Felhasználók helyreállítása"
   },
   "error": {
     "message": "Hiba"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "A szponzoráció létrejött."
   },
-  "revoke": {
-    "message": "Visszavonás"
-  },
   "emailSent": {
     "message": "Az email elküldésre került."
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "SCIM ellátás",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "A felhasználók és csoportok automatikusan biztosítása a kívánt identitás szolgáltatóval a SCIM szolgáltatáson keresztül.",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "SCIM engedélyezése",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Állítsuk be a kívánt azonosító szolgáltatót a webcím és a SCIM API kulcs konfigurálásával.",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "Ez az API kulcs hozzáféréssel rendelkezik a szervezeten belüli felhasználók kezeléséhez. Célszerű titokban tartani."
+  },
+  "copyScimKey": {
+    "message": "A SCIM API kulcs másolása a vágólapra",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "A SCIM API kulcs forgatása",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Biztosan forgatni akarjuk a SCIM API kulcsot? A jelenlegi kulcs már nem működik egyik meglévő integrációhoz sem.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Kulcs forgatása"
+  },
+  "scimApiKey": {
+    "message": "SCIM API kulcs",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "A SCIM cégpont webcím másolása a vágólapra",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "SCIM webcím",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "A SCIM API kulcs sikeresen forgatásra került.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "A SCIM beállítások sikeresen mentésre kerültek.",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Az adatbevitel kötelező."
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "Be"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/id/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "Akun baru Anda telah dibuat! Sekarang Anda bisa masuk."
   },
+  "trialAccountCreated": {
+    "message": "Account created successfully."
+  },
   "masterPassSent": {
     "message": "Kami telah mengirimi Anda email dengan petunjuk sandi utama Anda."
   },
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "Diaktifkan"
   },
-  "activate": {
-    "message": "Activate"
+  "restoreAccess": {
+    "message": "Restore Access"
   },
   "premium": {
     "message": "Premium",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "Nonaktifkan"
   },
-  "deactivate": {
-    "message": "Deactivate"
+  "revokeAccess": {
+    "message": "Revoke Access"
   },
   "twoStepLoginProviderEnabled": {
     "message": "Penyedia proses masuk dua langkah ini diaktifkan di akun Anda."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "Penagihan"
   },
+  "billingPlanLabel": {
+    "message": "Billing Plan"
+  },
+  "paymentType": {
+    "message": "Payment Type"
+  },
   "accountCredit": {
     "message": "Kredit Akun",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "tahun"
   },
+  "yr": {
+    "message": "yr"
+  },
   "month": {
     "message": "bulan"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Informasi tagihan"
   },
+  "billingTrialSubLabel": {
+    "message": "Your payment method will not be charged during the 7 day free trial."
+  },
   "creditCard": {
     "message": "Kartu kredit"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Thanks for signing up for Bitwarden for $PLAN$!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "Your $PLAN$ 7 day free trial will be converted to a paid subscription after 7 days.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "We've sent a confirmation email to your team's billing email at "
+  },
   "monthly": {
     "message": "Bulanan"
   },
   "annually": {
     "message": "Setiap tahun"
   },
+  "annual": {
+    "message": "Annual"
+  },
   "basePrice": {
     "message": "Harga dasar"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "Apakah Anda yakin ingin menghapus pengguna ini?"
   },
-  "deactivateUserConfirmation": {
-    "message": "The member will no longer have access to the organization, but will still have access to their individual vault."
+  "removeOrgUserConfirmation": {
+    "message": "When a member is removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again."
   },
-  "activateUserConfirmation": {
-    "message": "Are you sure you want to activate this user, granting them access to the organization?"
+  "revokeUserConfirmation": {
+    "message": "When a member is revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Warning! This user requires Key Connector to manage their encryption. Removing this user from your organization will permanently disable their account. This action cannot be undone. Do you want to proceed?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Deactivated user $ID$.",
+  "removeUserIdAccess": {
+    "message": "Remove $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Activated user $ID$.",
+  "revokedUserId": {
+    "message": "Revoked organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Deactivate user $ID$?",
+  "restoredUserId": {
+    "message": "Restored organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Activate user $ID$?",
+  "revokeUserId": {
+    "message": "Revoke $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "Dinonaktifkan"
   },
-  "deactivated": {
-    "message": "Deactivated"
+  "revoked": {
+    "message": "Revoked"
   },
   "sendLink": {
     "message": "Kirim Tautan",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "Are you sure you want to remove the following users? The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "deactivateUsersWarning": {
-    "message": "Are you sure you want to deactivate the following members? They will no longer have access to the organization, but will still have access to their individual vaults. The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "removeOrgUsersConfirmation": {
+    "message": "When member(s) are removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "activateUsersWarning": {
-    "message": "Are you sure you want to activate the following members, granting them access to the organization? The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "revokeUsersWarning": {
+    "message": "When member(s) are revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
   "theme": {
     "message": "Tema"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "Penghapusan sukses"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Deactivated successfully"
+  "bulkRevokedMessage": {
+    "message": "Revoked organization access successfully"
   },
-  "bulkActivatedMessage": {
-    "message": "Activated successfully"
+  "bulkRestoredMessage": {
+    "message": "Restored organization access successfully"
   },
   "bulkFilteredMessage": {
     "message": "Excluded, not applicable for this action."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "Hapus pengguna"
   },
-  "deactivateUsers": {
-    "message": "Deactivate Users"
+  "revokeUsers": {
+    "message": "Revoke Users"
   },
-  "activateUsers": {
-    "message": "Activate Users"
+  "restoreUsers": {
+    "message": "Restore Users"
   },
   "error": {
     "message": "Galat"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Sponsorship Created"
   },
-  "revoke": {
-    "message": "Revoke"
-  },
   "emailSent": {
     "message": "Email Terkirim"
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "SCIM Provisioning",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Enable SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Set up your preferred identity provider by configuring the URL and SCIM API Key",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "This API key has access to manage users within your organization. It should be kept secret."
+  },
+  "copyScimKey": {
+    "message": "Copy the SCIM API Key to your clipboard",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Rotate the SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Are you sure you want to rotate the SCIM API Key? The current key will no longer work for any existing integrations.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Rotate Key"
+  },
+  "scimApiKey": {
+    "message": "SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Copy the SCIM endpoint URL to your clipboard",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "SCIM URL",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "The SCIM API Key has been successfully rotated",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "SCIM settings have been saved successfully",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Input is required."
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "On"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/it/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "Il tuo nuovo account è stato creato! Ora puoi accedere."
   },
+  "trialAccountCreated": {
+    "message": "Account creato con successo."
+  },
   "masterPassSent": {
     "message": "Ti abbiamo inviato un'email con il tuo suggerimento per la password principale."
   },
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "Abilitato"
   },
-  "activate": {
-    "message": "Attiva"
+  "restoreAccess": {
+    "message": "Ripristina l'accesso"
   },
   "premium": {
     "message": "Premium",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "Disabilita"
   },
-  "deactivate": {
-    "message": "Disattiva"
+  "revokeAccess": {
+    "message": "Revoca l'accesso"
   },
   "twoStepLoginProviderEnabled": {
     "message": "Questo metodo di verifica in due passaggi è abilitato sul tuo account."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "Fatturazione"
   },
+  "billingPlanLabel": {
+    "message": "Piano di fatturazione"
+  },
+  "paymentType": {
+    "message": "Metodo di pagamento"
+  },
   "accountCredit": {
     "message": "Credito account",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "anno"
   },
+  "yr": {
+    "message": "anno"
+  },
   "month": {
     "message": "mese"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Dati di fatturazione"
   },
+  "billingTrialSubLabel": {
+    "message": "Non verrà addebitato nulla sul vostro metodo di pagamento durante i sette giorni di prova gratuita."
+  },
   "creditCard": {
     "message": "Carta di credito"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Grazie per esserti iscritto a Bitwarden con il piano $PLAN$!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "La prova gratuita di 7 giorni del piano $PLAN$ sarà convertita in un abbonamento dopo 7 giorni.\n",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "Abbiamo inviato un'email di conferma all'email di fatturazione del vostro team "
+  },
   "monthly": {
     "message": "Mensile"
   },
   "annually": {
     "message": "Annuale"
   },
+  "annual": {
+    "message": "Annuale"
+  },
   "basePrice": {
     "message": "Prezzo base"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "Confermi di voler rimuovere questo utente?"
   },
-  "deactivateUserConfirmation": {
-    "message": "Il membro non avrà più accesso all'organizzazione, ma continuerà ad avere accesso alla propria cassaforte."
+  "removeOrgUserConfirmation": {
+    "message": "Quando un membro viene rimosso, non ha più accesso ai dati dell'organizzazione e questa azione è irreversibile. Per aggiungere di nuovo il membro all'organizzazione, è necessario invitarlo e inserirlo nuovamente nell'organizzazione."
   },
-  "activateUserConfirmation": {
-    "message": "Sei sicuro di voler attivare questo utente e concedere l'accesso all'organizzazione?"
+  "revokeUserConfirmation": {
+    "message": "Quando un membro viene revocato, non ha più accesso ai dati dell'organizzazione. Per ripristinare rapidamente l'accesso dei membri, accedere alla scheda Revoca."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Attenzione! Questo utente richiede Key Connector per gestire la crittografia. Rimuovere questo utente dalla propria organizzazione disabiliterà definitivamente l'account. Questa azione non può essere annullata. Vuoi procedere?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Utente $ID$ disattivato.",
+  "removeUserIdAccess": {
+    "message": "Rimuovi l'accesso di $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Utente $ID$ attivato.",
+  "revokedUserId": {
+    "message": "Accesso all'organizzazione revocato a $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Disattivare l'utente $ID$?",
+  "restoredUserId": {
+    "message": "Accesso all'organizzazione ripristinato per $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Attivare l'utente $ID$?",
+  "revokeUserId": {
+    "message": "Accesso revocato a $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "Disabilitato"
   },
-  "deactivated": {
-    "message": "Disattivato"
+  "revoked": {
+    "message": "Revocato"
   },
   "sendLink": {
     "message": "Collegamento del Send",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "Sei sicuro di voler rimuovere i seguenti utenti? Il processo potrebbe richiedere alcuni secondi per essere completato e non può essere interrotto o annullato."
   },
-  "deactivateUsersWarning": {
-    "message": "Sei sicuro di voler disattivare i seguenti membri? Non avranno più accesso all'organizzazione, ma continueranno comunque ad avere accesso alle loro casseforti personali. Il processo può richiedere alcuni secondi e non può essere interrotto o annullato."
+  "removeOrgUsersConfirmation": {
+    "message": "Quando i membri vengono rimossi, non hanno più accesso ai dati dell'organizzazione e questa azione è irreversibile. Per aggiungere di nuovo il membro all'organizzazione, è necessario invitarlo e inserirlo nuovamente nell'organizzazione. Il processo può richiedere alcuni secondi e non può essere interrotto o annullato."
   },
-  "activateUsersWarning": {
-    "message": "Sei sicuro di voler attivare i seguenti membri, concedendogli l'accesso all'organizzazione? Il processo potrebbe richiedere alcuni secondi e non può essere interrotto o annullato."
+  "revokeUsersWarning": {
+    "message": "Quando i membri vengono revocati, non hanno più accesso ai dati dell'organizzazione. Per ripristinare rapidamente l'accesso dei membri, accedere alla scheda Revocati. Il processo può richiedere alcuni secondi e non può essere interrotto o annullato."
   },
   "theme": {
     "message": "Tema"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "Rimosso correttamente"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Disattivato con successo"
+  "bulkRevokedMessage": {
+    "message": "Accesso all'organizzazione revocato con successo"
   },
-  "bulkActivatedMessage": {
-    "message": "Attivato con successo"
+  "bulkRestoredMessage": {
+    "message": "Accesso all'organizzazione ripristinato con successo"
   },
   "bulkFilteredMessage": {
     "message": "Escluso, non applicabile per questa azione."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "Rimuovi utenti"
   },
-  "deactivateUsers": {
-    "message": "Disattiva utenti"
+  "revokeUsers": {
+    "message": "Revoca utenti"
   },
-  "activateUsers": {
-    "message": "Attiva utenti"
+  "restoreUsers": {
+    "message": "Ripristina utenti"
   },
   "error": {
     "message": "Errore"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Sponsorizzazione creata"
   },
-  "revoke": {
-    "message": "Revoca"
-  },
   "emailSent": {
     "message": "Email inviata"
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "Provisioning SCIM",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Recupera utenti e gruppi con il tuo identity provider preferito tramite il provisioning SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Abilita SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Imposta il tuo identity provider preferito configurando l'URL e la chiave API SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "Questa chiave API ha accesso alla gestione degli utenti appartenenti alla tua organizzazione. Tienila segreta."
+  },
+  "copyScimKey": {
+    "message": "Copia la chiave API SCIM nei tuoi appunti",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Ruota la chiave API SCIM",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Sei sicuro di voler ruotare la chiave API SCIM? La chiave corrente non funzionerà più per nessuna delle integrazioni esistenti.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Ruota chiave"
+  },
+  "scimApiKey": {
+    "message": "Chiave API SCIM",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Copia l'URL dell'endpoint SCIM negli appunti",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "URL SCIM",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "La chiave API SCIM è stata ruotata con successo",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "Le impostazioni di SCIM sono state salvate con successo",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Input richiesto."
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "Attivo"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/ja/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "新しいアカウントを作成しました！今すぐログインできます。"
   },
+  "trialAccountCreated": {
+    "message": "アカウントを正常に作成しました。"
+  },
   "masterPassSent": {
     "message": "あなたのマスターパスワードのヒントを記載したメールを送信しました。"
   },
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "有効化されました"
   },
-  "activate": {
-    "message": "有効にする"
+  "restoreAccess": {
+    "message": "アクセスを復元する"
   },
   "premium": {
     "message": "プレミアム版",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "無効化"
   },
-  "deactivate": {
-    "message": "無効にする"
+  "revokeAccess": {
+    "message": "アクセスを取り消す"
   },
   "twoStepLoginProviderEnabled": {
     "message": "この二段階認証プロバイダは、あなたのアカウントで有効になっています。"
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "料金"
   },
+  "billingPlanLabel": {
+    "message": "請求プラン"
+  },
+  "paymentType": {
+    "message": "支払い方法"
+  },
   "accountCredit": {
     "message": "アカウント クレジット",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "年"
   },
+  "yr": {
+    "message": "年"
+  },
   "month": {
     "message": "月"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "請求情報"
   },
+  "billingTrialSubLabel": {
+    "message": "7日間の無料トライアルの間は請求されません。"
+  },
   "creditCard": {
     "message": "クレジットカード"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "$PLAN$ に Bitwarden を登録していただきありがとうございます！",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "$PLAN$ の7日間の無料トライアルは、7日後に有料サブスクリプションに変換されます。",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "あなたのチームの請求メールアドレスに確認メールを送信しました。 "
+  },
   "monthly": {
     "message": "1ヶ月"
   },
   "annually": {
     "message": "1年"
   },
+  "annual": {
+    "message": "年間"
+  },
   "basePrice": {
     "message": "基本価格"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "本当にこのユーザーを削除してもよろしいですか？"
   },
-  "deactivateUserConfirmation": {
-    "message": "メンバーはもう組織へのアクセス権を持っていませんが、個々の保管庫にアクセスすることはできます。"
+  "removeOrgUserConfirmation": {
+    "message": "メンバーが削除されると、メンバーは組織データにアクセスできなくなり、この操作は元に戻せません。 メンバーを組織に追加するには、再度招待して追加する必要があります。"
   },
-  "activateUserConfirmation": {
-    "message": "このユーザーを有効にして、組織へのアクセスを許可してもよろしいですか？"
+  "revokeUserConfirmation": {
+    "message": "メンバーのアクセスが取り消されると、組織データにアクセスできなくなります。メンバーアクセスをすばやく復元するには、取り消し済みタブに移動してください。"
   },
   "removeUserConfirmationKeyConnector": {
     "message": "警告! このユーザーは暗号化を管理するためにキー コネクタが必要です。 このユーザーを組織から削除すると、アカウントが完全に無効になります。この操作は元に戻せません。続行しますか？"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "ユーザー $ID$ を無効化しました。",
+  "removeUserIdAccess": {
+    "message": "$ID$ のアクセスを削除",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "ユーザー $ID$ を有効化しました。",
+  "revokedUserId": {
+    "message": "$ID$ の組織へのアクセスを取り消しました。",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "ユーザー $ID$ を無効にしますか？",
+  "restoredUserId": {
+    "message": "$ID$ の組織へのアクセスを復元しました。",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "ユーザー $ID$ を有効にしますか？",
+  "revokeUserId": {
+    "message": "$ID$ のアクセスを取り消し",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3088,7 +3127,7 @@
     }
   },
   "subscriptionMaxReached": {
-    "message": "Adjustments to your subscription will result in prorated changes to your billing totals. You cannot invite more than $COUNT$ users without increasing your subscription seats.",
+    "message": "サブスクリプションを調整すると、請求の合計が日割りで変更されます。サブスクリプションのユーザー数を増やさずに、$COUNT$以上のユーザーを招待することはできません。",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "無効"
   },
-  "deactivated": {
-    "message": "無効化済み"
+  "revoked": {
+    "message": "取り消し済み"
   },
   "sendLink": {
     "message": "Send リンク",
@@ -3831,7 +3870,7 @@
     "message": "招待状を受け取ることができません。新しい招待状を送信するよう組織の管理者に依頼してください。"
   },
   "emergencyInviteAcceptFailedShort": {
-    "message": "Unable to accept invitation. $DESCRIPTION$",
+    "message": "招待を受けることができません。$DESCRIPTION$",
     "placeholders": {
       "description": {
         "content": "$1",
@@ -3840,7 +3879,7 @@
     }
   },
   "emergencyInviteAcceptedDesc": {
-    "message": "You can access the emergency options for this user after your identity has been confirmed. We'll send you an email when that happens."
+    "message": "本人確認後、このユーザーの緊急時オプションにアクセスすることができます。その際には電子メールが送信されます。"
   },
   "requestAccess": {
     "message": "アクセス権の要求"
@@ -4288,26 +4327,26 @@
   "removeUsersWarning": {
     "message": "次のユーザーを削除してもよろしいですか？プロセスは完了まで数秒かかることがあり、中断またはキャンセルすることはできません。"
   },
-  "deactivateUsersWarning": {
-    "message": "次のメンバーを無効にしてもよろしいですか？ 彼らはもう組織にアクセスすることはできませんが、個々の保管庫にアクセスすることはできます。 プロセスは完了するまで数秒かかることがあり、中断またはキャンセルすることはできません。"
+  "removeOrgUsersConfirmation": {
+    "message": "メンバーが削除されると、メンバーは組織データにアクセスできなくなり、この操作は元に戻せません。 メンバーを組織に追加するには、再度招待して追加する必要があります。完了するまで数秒かかることがあり、中断またはキャンセルすることはできません。"
   },
-  "activateUsersWarning": {
-    "message": "次のメンバーを有効にして組織へのアクセスを許可しますか？ プロセスは完了するまで数秒かかることがあり、中断またはキャンセルすることはできません。"
+  "revokeUsersWarning": {
+    "message": "メンバーのアクセスが取り消されると、組織データにアクセスできなくなります。アクセスをすばやく復元するには、取り消し済みタブに移動してください。 完了するまで数秒かかることがあり、中断またはキャンセルすることはできません。"
   },
   "theme": {
-    "message": "Theme"
+    "message": "テーマ"
   },
   "themeDesc": {
     "message": "Choose a theme for your web vault."
   },
   "themeSystem": {
-    "message": "Use System Theme"
+    "message": "システムのテーマを使用する。"
   },
   "themeDark": {
-    "message": "Dark"
+    "message": "ダーク"
   },
   "themeLight": {
-    "message": "Light"
+    "message": "ライト"
   },
   "confirmSelected": {
     "message": "選択を確認"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "削除しました "
   },
-  "bulkDeactivatedMessage": {
-    "message": "無効化しました"
+  "bulkRevokedMessage": {
+    "message": "組織へのアクセスを取り消しました"
   },
-  "bulkActivatedMessage": {
-    "message": "有効化しました"
+  "bulkRestoredMessage": {
+    "message": "組織へのアクセスを復元しました"
   },
   "bulkFilteredMessage": {
     "message": "除外します。このアクションには適用されません。"
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "ユーザーを削除"
   },
-  "deactivateUsers": {
-    "message": "ユーザーを無効化"
+  "revokeUsers": {
+    "message": "ユーザーを取り消す"
   },
-  "activateUsers": {
-    "message": "ユーザーを有効化"
+  "restoreUsers": {
+    "message": "ユーザーの復元"
   },
   "error": {
     "message": "エラー"
@@ -4367,7 +4406,7 @@
     "message": "The provider has been set up."
   },
   "clients": {
-    "message": "Clients"
+    "message": "クライアント"
   },
   "providerAdmin": {
     "message": "Provider Admin"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Sponsorship Created"
   },
-  "revoke": {
-    "message": "Revoke"
-  },
   "emailSent": {
     "message": "Email Sent"
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "SCIM プロビジョニング",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "SCIM プロビジョニングにより、ユーザーとグループを希望する ID プロバイダーで自動的にプロビジョニングします。",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "SCIM を有効にする",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "URL と SCIM API キーを設定して、ご希望の ID プロバイダーを設定します",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "この API キーは、組織内のユーザーを管理するためのアクセス権を持っています。慎重に取り扱ってください。"
+  },
+  "copyScimKey": {
+    "message": "SCIM API キーをクリップボードにコピー",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "SCIM API キーをローテーション",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "SCIM API キーをローテーションさせてもよろしいですか？現在のキーでは動作しなくなります。",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "キーをローテーション"
+  },
+  "scimApiKey": {
+    "message": "SCIM API キー",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "SCIM エンドポイント URL をクリップボードにコピー",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "SCIM URL",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "SCIM API キーのローテーションに成功しました",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "SCIM 設定を保存しました。",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "入力が必要です。"
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "オン"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/ka/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "Your new account has been created! You may now log in."
   },
+  "trialAccountCreated": {
+    "message": "Account created successfully."
+  },
   "masterPassSent": {
     "message": "We've sent you an email with your master password hint."
   },
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "Enabled"
   },
-  "activate": {
-    "message": "Activate"
+  "restoreAccess": {
+    "message": "Restore Access"
   },
   "premium": {
     "message": "Premium",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "Disable"
   },
-  "deactivate": {
-    "message": "Deactivate"
+  "revokeAccess": {
+    "message": "Revoke Access"
   },
   "twoStepLoginProviderEnabled": {
     "message": "This two-step login provider is enabled on your account."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "Billing"
   },
+  "billingPlanLabel": {
+    "message": "Billing Plan"
+  },
+  "paymentType": {
+    "message": "Payment Type"
+  },
   "accountCredit": {
     "message": "Account Credit",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "year"
   },
+  "yr": {
+    "message": "yr"
+  },
   "month": {
     "message": "month"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Billing Information"
   },
+  "billingTrialSubLabel": {
+    "message": "Your payment method will not be charged during the 7 day free trial."
+  },
   "creditCard": {
     "message": "Credit Card"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Thanks for signing up for Bitwarden for $PLAN$!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "Your $PLAN$ 7 day free trial will be converted to a paid subscription after 7 days.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "We've sent a confirmation email to your team's billing email at "
+  },
   "monthly": {
     "message": "Monthly"
   },
   "annually": {
     "message": "Annually"
   },
+  "annual": {
+    "message": "Annual"
+  },
   "basePrice": {
     "message": "Base Price"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "Are you sure you want to remove this user?"
   },
-  "deactivateUserConfirmation": {
-    "message": "The member will no longer have access to the organization, but will still have access to their individual vault."
+  "removeOrgUserConfirmation": {
+    "message": "When a member is removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again."
   },
-  "activateUserConfirmation": {
-    "message": "Are you sure you want to activate this user, granting them access to the organization?"
+  "revokeUserConfirmation": {
+    "message": "When a member is revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Warning! This user requires Key Connector to manage their encryption. Removing this user from your organization will permanently disable their account. This action cannot be undone. Do you want to proceed?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Deactivated user $ID$.",
+  "removeUserIdAccess": {
+    "message": "Remove $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Activated user $ID$.",
+  "revokedUserId": {
+    "message": "Revoked organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Deactivate user $ID$?",
+  "restoredUserId": {
+    "message": "Restored organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Activate user $ID$?",
+  "revokeUserId": {
+    "message": "Revoke $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "Disabled"
   },
-  "deactivated": {
-    "message": "Deactivated"
+  "revoked": {
+    "message": "Revoked"
   },
   "sendLink": {
     "message": "Send link",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "Are you sure you want to remove the following users? The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "deactivateUsersWarning": {
-    "message": "Are you sure you want to deactivate the following members? They will no longer have access to the organization, but will still have access to their individual vaults. The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "removeOrgUsersConfirmation": {
+    "message": "When member(s) are removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "activateUsersWarning": {
-    "message": "Are you sure you want to activate the following members, granting them access to the organization? The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "revokeUsersWarning": {
+    "message": "When member(s) are revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
   "theme": {
     "message": "Theme"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "Removed successfully"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Deactivated successfully"
+  "bulkRevokedMessage": {
+    "message": "Revoked organization access successfully"
   },
-  "bulkActivatedMessage": {
-    "message": "Activated successfully"
+  "bulkRestoredMessage": {
+    "message": "Restored organization access successfully"
   },
   "bulkFilteredMessage": {
     "message": "Excluded, not applicable for this action."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "Remove Users"
   },
-  "deactivateUsers": {
-    "message": "Deactivate Users"
+  "revokeUsers": {
+    "message": "Revoke Users"
   },
-  "activateUsers": {
-    "message": "Activate Users"
+  "restoreUsers": {
+    "message": "Restore Users"
   },
   "error": {
     "message": "Error"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Sponsorship Created"
   },
-  "revoke": {
-    "message": "Revoke"
-  },
   "emailSent": {
     "message": "Email Sent"
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "SCIM Provisioning",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Enable SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Set up your preferred identity provider by configuring the URL and SCIM API Key",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "This API key has access to manage users within your organization. It should be kept secret."
+  },
+  "copyScimKey": {
+    "message": "Copy the SCIM API Key to your clipboard",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Rotate the SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Are you sure you want to rotate the SCIM API Key? The current key will no longer work for any existing integrations.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Rotate Key"
+  },
+  "scimApiKey": {
+    "message": "SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Copy the SCIM endpoint URL to your clipboard",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "SCIM URL",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "The SCIM API Key has been successfully rotated",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "SCIM settings have been saved successfully",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Input is required."
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "On"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/km/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "Your new account has been created! You may now log in."
   },
+  "trialAccountCreated": {
+    "message": "Account created successfully."
+  },
   "masterPassSent": {
     "message": "We've sent you an email with your master password hint."
   },
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "Enabled"
   },
-  "activate": {
-    "message": "Activate"
+  "restoreAccess": {
+    "message": "Restore Access"
   },
   "premium": {
     "message": "Premium",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "Disable"
   },
-  "deactivate": {
-    "message": "Deactivate"
+  "revokeAccess": {
+    "message": "Revoke Access"
   },
   "twoStepLoginProviderEnabled": {
     "message": "This two-step login provider is enabled on your account."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "Billing"
   },
+  "billingPlanLabel": {
+    "message": "Billing Plan"
+  },
+  "paymentType": {
+    "message": "Payment Type"
+  },
   "accountCredit": {
     "message": "Account Credit",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "year"
   },
+  "yr": {
+    "message": "yr"
+  },
   "month": {
     "message": "month"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Billing Information"
   },
+  "billingTrialSubLabel": {
+    "message": "Your payment method will not be charged during the 7 day free trial."
+  },
   "creditCard": {
     "message": "Credit Card"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Thanks for signing up for Bitwarden for $PLAN$!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "Your $PLAN$ 7 day free trial will be converted to a paid subscription after 7 days.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "We've sent a confirmation email to your team's billing email at "
+  },
   "monthly": {
     "message": "Monthly"
   },
   "annually": {
     "message": "Annually"
   },
+  "annual": {
+    "message": "Annual"
+  },
   "basePrice": {
     "message": "Base Price"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "Are you sure you want to remove this user?"
   },
-  "deactivateUserConfirmation": {
-    "message": "The member will no longer have access to the organization, but will still have access to their individual vault."
+  "removeOrgUserConfirmation": {
+    "message": "When a member is removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again."
   },
-  "activateUserConfirmation": {
-    "message": "Are you sure you want to activate this user, granting them access to the organization?"
+  "revokeUserConfirmation": {
+    "message": "When a member is revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Warning! This user requires Key Connector to manage their encryption. Removing this user from your organization will permanently disable their account. This action cannot be undone. Do you want to proceed?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Deactivated user $ID$.",
+  "removeUserIdAccess": {
+    "message": "Remove $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Activated user $ID$.",
+  "revokedUserId": {
+    "message": "Revoked organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Deactivate user $ID$?",
+  "restoredUserId": {
+    "message": "Restored organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Activate user $ID$?",
+  "revokeUserId": {
+    "message": "Revoke $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "Disabled"
   },
-  "deactivated": {
-    "message": "Deactivated"
+  "revoked": {
+    "message": "Revoked"
   },
   "sendLink": {
     "message": "Send link",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "Are you sure you want to remove the following users? The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "deactivateUsersWarning": {
-    "message": "Are you sure you want to deactivate the following members? They will no longer have access to the organization, but will still have access to their individual vaults. The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "removeOrgUsersConfirmation": {
+    "message": "When member(s) are removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "activateUsersWarning": {
-    "message": "Are you sure you want to activate the following members, granting them access to the organization? The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "revokeUsersWarning": {
+    "message": "When member(s) are revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
   "theme": {
     "message": "Theme"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "Removed successfully"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Deactivated successfully"
+  "bulkRevokedMessage": {
+    "message": "Revoked organization access successfully"
   },
-  "bulkActivatedMessage": {
-    "message": "Activated successfully"
+  "bulkRestoredMessage": {
+    "message": "Restored organization access successfully"
   },
   "bulkFilteredMessage": {
     "message": "Excluded, not applicable for this action."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "Remove Users"
   },
-  "deactivateUsers": {
-    "message": "Deactivate Users"
+  "revokeUsers": {
+    "message": "Revoke Users"
   },
-  "activateUsers": {
-    "message": "Activate Users"
+  "restoreUsers": {
+    "message": "Restore Users"
   },
   "error": {
     "message": "Error"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Sponsorship Created"
   },
-  "revoke": {
-    "message": "Revoke"
-  },
   "emailSent": {
     "message": "Email Sent"
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "SCIM Provisioning",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Enable SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Set up your preferred identity provider by configuring the URL and SCIM API Key",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "This API key has access to manage users within your organization. It should be kept secret."
+  },
+  "copyScimKey": {
+    "message": "Copy the SCIM API Key to your clipboard",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Rotate the SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Are you sure you want to rotate the SCIM API Key? The current key will no longer work for any existing integrations.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Rotate Key"
+  },
+  "scimApiKey": {
+    "message": "SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Copy the SCIM endpoint URL to your clipboard",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "SCIM URL",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "The SCIM API Key has been successfully rotated",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "SCIM settings have been saved successfully",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Input is required."
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "On"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/kn/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "ನಿಮ್ಮ ಹೊಸ ಖಾತೆಯನ್ನು ರಚಿಸಲಾಗಿದೆ! ನೀವು ಈಗ ಲಾಗ್ ಇನ್ ಮಾಡಬಹುದು."
   },
+  "trialAccountCreated": {
+    "message": "Account created successfully."
+  },
   "masterPassSent": {
     "message": "ನಿಮ್ಮ ಮಾಸ್ಟರ್ ಪಾಸ್‌ವರ್ಡ್ ಸುಳಿವಿನೊಂದಿಗೆ ನಾವು ನಿಮಗೆ ಇಮೇಲ್ ಕಳುಹಿಸಿದ್ದೇವೆ."
   },
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "ಸಕ್ರಿಯಗೊಳಿಸಿದೆ"
   },
-  "activate": {
-    "message": "Activate"
+  "restoreAccess": {
+    "message": "Restore Access"
   },
   "premium": {
     "message": "ಪ್ರೀಮಿಯಮ್",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "ನಿಷ್‌ಕ್ರಿಯೆಗೊಳಿಸಿ"
   },
-  "deactivate": {
-    "message": "Deactivate"
+  "revokeAccess": {
+    "message": "Revoke Access"
   },
   "twoStepLoginProviderEnabled": {
     "message": "ಈ ಎರಡು ಹಂತದ ಲಾಗಿನ್ ಒದಗಿಸುವವರನ್ನು ನಿಮ್ಮ ಖಾತೆಯಲ್ಲಿ ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "ಬಿಲ್ಲಿಂಗ್"
   },
+  "billingPlanLabel": {
+    "message": "Billing Plan"
+  },
+  "paymentType": {
+    "message": "Payment Type"
+  },
   "accountCredit": {
     "message": "ಖಾತೆ ಕ್ರೆಡಿಟ್",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "ವರ್ಷ"
   },
+  "yr": {
+    "message": "yr"
+  },
   "month": {
     "message": "ತಿಂಗಳು"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "ಬಿಲ್ಲಿಂಗ್ ಮಾಹಿತಿ"
   },
+  "billingTrialSubLabel": {
+    "message": "Your payment method will not be charged during the 7 day free trial."
+  },
   "creditCard": {
     "message": "ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Thanks for signing up for Bitwarden for $PLAN$!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "Your $PLAN$ 7 day free trial will be converted to a paid subscription after 7 days.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "We've sent a confirmation email to your team's billing email at "
+  },
   "monthly": {
     "message": "ಮಾಸಿಕ"
   },
   "annually": {
     "message": "ವಾರ್ಷಿಕವಾಗಿ"
   },
+  "annual": {
+    "message": "Annual"
+  },
   "basePrice": {
     "message": "ಮೂಲ ದರ"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "ಈ ಬಳಕೆದಾರರನ್ನು ತೆಗೆದುಹಾಕಲು ನೀವು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?"
   },
-  "deactivateUserConfirmation": {
-    "message": "The member will no longer have access to the organization, but will still have access to their individual vault."
+  "removeOrgUserConfirmation": {
+    "message": "When a member is removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again."
   },
-  "activateUserConfirmation": {
-    "message": "Are you sure you want to activate this user, granting them access to the organization?"
+  "revokeUserConfirmation": {
+    "message": "When a member is revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Warning! This user requires Key Connector to manage their encryption. Removing this user from your organization will permanently disable their account. This action cannot be undone. Do you want to proceed?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Deactivated user $ID$.",
+  "removeUserIdAccess": {
+    "message": "Remove $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Activated user $ID$.",
+  "revokedUserId": {
+    "message": "Revoked organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Deactivate user $ID$?",
+  "restoredUserId": {
+    "message": "Restored organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Activate user $ID$?",
+  "revokeUserId": {
+    "message": "Revoke $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"
   },
-  "deactivated": {
-    "message": "Deactivated"
+  "revoked": {
+    "message": "Revoked"
   },
   "sendLink": {
     "message": "ಲಿಂಕ್ ಕಳುಹಿಸಿ",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "ಕೆಳಗಿನ ಬಳಕೆದಾರರನ್ನು ತೆಗೆದುಹಾಕಲು ನೀವು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ? ಪ್ರಕ್ರಿಯೆಯು ಪೂರ್ಣಗೊಳ್ಳಲು ಕೆಲವು ಸೆಕೆಂಡುಗಳು ತೆಗೆದುಕೊಳ್ಳಬಹುದು ಮತ್ತು ಅದನ್ನು ಅಡ್ಡಿಪಡಿಸಲು ಅಥವಾ ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
   },
-  "deactivateUsersWarning": {
-    "message": "Are you sure you want to deactivate the following members? They will no longer have access to the organization, but will still have access to their individual vaults. The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "removeOrgUsersConfirmation": {
+    "message": "When member(s) are removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "activateUsersWarning": {
-    "message": "Are you sure you want to activate the following members, granting them access to the organization? The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "revokeUsersWarning": {
+    "message": "When member(s) are revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
   "theme": {
     "message": "Theme"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "ಯಶಸ್ವಿಯಾಗಿ ತೆಗೆದುಹಾಕಲಾಗಿದೆ"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Deactivated successfully"
+  "bulkRevokedMessage": {
+    "message": "Revoked organization access successfully"
   },
-  "bulkActivatedMessage": {
-    "message": "Activated successfully"
+  "bulkRestoredMessage": {
+    "message": "Restored organization access successfully"
   },
   "bulkFilteredMessage": {
     "message": "ಹೊರಗಿಡಲಾಗಿದೆ, ಈ ಕ್ರಿಯೆಗೆ ಅನ್ವಯಿಸುವುದಿಲ್ಲ."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "ಬಳಕೆದಾರರನ್ನು ತೆಗೆದುಹಾಕಿ"
   },
-  "deactivateUsers": {
-    "message": "Deactivate Users"
+  "revokeUsers": {
+    "message": "Revoke Users"
   },
-  "activateUsers": {
-    "message": "Activate Users"
+  "restoreUsers": {
+    "message": "Restore Users"
   },
   "error": {
     "message": "ದೋಷ"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Sponsorship Created"
   },
-  "revoke": {
-    "message": "Revoke"
-  },
   "emailSent": {
     "message": "Email Sent"
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "SCIM Provisioning",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Enable SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Set up your preferred identity provider by configuring the URL and SCIM API Key",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "This API key has access to manage users within your organization. It should be kept secret."
+  },
+  "copyScimKey": {
+    "message": "Copy the SCIM API Key to your clipboard",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Rotate the SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Are you sure you want to rotate the SCIM API Key? The current key will no longer work for any existing integrations.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Rotate Key"
+  },
+  "scimApiKey": {
+    "message": "SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Copy the SCIM endpoint URL to your clipboard",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "SCIM URL",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "The SCIM API Key has been successfully rotated",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "SCIM settings have been saved successfully",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Input is required."
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "On"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/ko/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "계정 생성이 완료되었습니다! 이제 로그인하실 수 있습니다."
   },
+  "trialAccountCreated": {
+    "message": "Account created successfully."
+  },
   "masterPassSent": {
     "message": "마스터 비밀번호 힌트가 담긴 이메일을 보냈습니다."
   },
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "활성화됨"
   },
-  "activate": {
-    "message": "활성화"
+  "restoreAccess": {
+    "message": "Restore Access"
   },
   "premium": {
     "message": "프리미엄",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "비활성화"
   },
-  "deactivate": {
-    "message": "비활성화"
+  "revokeAccess": {
+    "message": "Revoke Access"
   },
   "twoStepLoginProviderEnabled": {
     "message": "이 2단계 로그인 제공자는 귀하의 계정에 사용 가능합니다."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "결제"
   },
+  "billingPlanLabel": {
+    "message": "Billing Plan"
+  },
+  "paymentType": {
+    "message": "Payment Type"
+  },
   "accountCredit": {
     "message": "계정 크레딧",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "년"
   },
+  "yr": {
+    "message": "yr"
+  },
   "month": {
     "message": "월"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "결제 정보"
   },
+  "billingTrialSubLabel": {
+    "message": "Your payment method will not be charged during the 7 day free trial."
+  },
   "creditCard": {
     "message": "신용카드"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Thanks for signing up for Bitwarden for $PLAN$!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "Your $PLAN$ 7 day free trial will be converted to a paid subscription after 7 days.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "We've sent a confirmation email to your team's billing email at "
+  },
   "monthly": {
     "message": "월간"
   },
   "annually": {
     "message": "연간"
   },
+  "annual": {
+    "message": "Annual"
+  },
   "basePrice": {
     "message": "기준 단가"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "정말 이 사용자를 제거하시겠습니까?"
   },
-  "deactivateUserConfirmation": {
-    "message": "The member will no longer have access to the organization, but will still have access to their individual vault."
+  "removeOrgUserConfirmation": {
+    "message": "When a member is removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again."
   },
-  "activateUserConfirmation": {
-    "message": "Are you sure you want to activate this user, granting them access to the organization?"
+  "revokeUserConfirmation": {
+    "message": "When a member is revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Warning! This user requires Key Connector to manage their encryption. Removing this user from your organization will permanently disable their account. This action cannot be undone. Do you want to proceed?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Deactivated user $ID$.",
+  "removeUserIdAccess": {
+    "message": "Remove $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Activated user $ID$.",
+  "revokedUserId": {
+    "message": "Revoked organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Deactivate user $ID$?",
+  "restoredUserId": {
+    "message": "Restored organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Activate user $ID$?",
+  "revokeUserId": {
+    "message": "Revoke $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "비활성화됨"
   },
-  "deactivated": {
-    "message": "Deactivated"
+  "revoked": {
+    "message": "Revoked"
   },
   "sendLink": {
     "message": "Send 링크",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "정말로 다음 사용자를 삭제하시겠어요? 프로세스를 완료하는 데에는 몇 초 정도가 걸릴 수 있으며 도중에 중단하거나 취소할 수 없습니다."
   },
-  "deactivateUsersWarning": {
-    "message": "Are you sure you want to deactivate the following members? They will no longer have access to the organization, but will still have access to their individual vaults. The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "removeOrgUsersConfirmation": {
+    "message": "When member(s) are removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "activateUsersWarning": {
-    "message": "Are you sure you want to activate the following members, granting them access to the organization? The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "revokeUsersWarning": {
+    "message": "When member(s) are revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
   "theme": {
     "message": "테마"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "성공적으로 제거됨"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Deactivated successfully"
+  "bulkRevokedMessage": {
+    "message": "Revoked organization access successfully"
   },
-  "bulkActivatedMessage": {
-    "message": "Activated successfully"
+  "bulkRestoredMessage": {
+    "message": "Restored organization access successfully"
   },
   "bulkFilteredMessage": {
     "message": "제외되었습니다. 이 작업에는 적용되지 않습니다."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "사용자 삭제"
   },
-  "deactivateUsers": {
-    "message": "Deactivate Users"
+  "revokeUsers": {
+    "message": "Revoke Users"
   },
-  "activateUsers": {
-    "message": "Activate Users"
+  "restoreUsers": {
+    "message": "Restore Users"
   },
   "error": {
     "message": "오류"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Sponsorship Created"
   },
-  "revoke": {
-    "message": "Revoke"
-  },
   "emailSent": {
     "message": "Email Sent"
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "SCIM Provisioning",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Enable SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Set up your preferred identity provider by configuring the URL and SCIM API Key",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "This API key has access to manage users within your organization. It should be kept secret."
+  },
+  "copyScimKey": {
+    "message": "Copy the SCIM API Key to your clipboard",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Rotate the SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Are you sure you want to rotate the SCIM API Key? The current key will no longer work for any existing integrations.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Rotate Key"
+  },
+  "scimApiKey": {
+    "message": "SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Copy the SCIM endpoint URL to your clipboard",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "SCIM URL",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "The SCIM API Key has been successfully rotated",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "SCIM settings have been saved successfully",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Input is required."
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "On"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }

apps/web/src/locales/lv/messages.json

@@ -644,6 +644,9 @@
   "newAccountCreated": {
     "message": "Tavs jaunais konts ir izveidots. Tagad Tu vari pierakstīties."
   },
+  "trialAccountCreated": {
+    "message": "Konts tika veiksmīgi izveidots."
+  },
   "masterPassSent": {
     "message": "Galvenās paroles norāde ir nosūtīta e-pastā."
   },
@@ -1247,8 +1250,8 @@
   "enabled": {
     "message": "Iespējots"
   },
-  "activate": {
-    "message": "Activate"
+  "restoreAccess": {
+    "message": "Restore Access"
   },
   "premium": {
     "message": "Premium",
@@ -1275,8 +1278,8 @@
   "disable": {
     "message": "Atspējot"
   },
-  "deactivate": {
-    "message": "Deactivate"
+  "revokeAccess": {
+    "message": "Revoke Access"
   },
   "twoStepLoginProviderEnabled": {
     "message": "Šis divpakāpju pierakstīšanās nodrošinātājs ir iespējots kontā."
@@ -1669,6 +1672,12 @@
   "billing": {
     "message": "Norēķini"
   },
+  "billingPlanLabel": {
+    "message": "Rēķinu plāns"
+  },
+  "paymentType": {
+    "message": "Maksājuma veids"
+  },
   "accountCredit": {
     "message": "Konta kredīts",
     "description": "Financial term. In the case of Bitwarden, a positive balance means that you owe money, while a negative balance means that you have a credit (Bitwarden owes you money)."
@@ -1785,6 +1794,9 @@
   "year": {
     "message": "gadā"
   },
+  "yr": {
+    "message": "gadā"
+  },
   "month": {
     "message": "mēnesī"
   },
@@ -1813,6 +1825,9 @@
   "billingInformation": {
     "message": "Norēķinu informācija"
   },
+  "billingTrialSubLabel": {
+    "message": "Norādītais maksājuma veids netiks izmantots 7 dienu bezmaksas izmēģinājuma laikā."
+  },
   "creditCard": {
     "message": "Maksājumu karte"
   },
@@ -2169,12 +2184,36 @@
       }
     }
   },
+  "trialThankYou": {
+    "message": "Paldies par pieteikšanos Bitwarden $PLAN$!",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialPaidInfoMessage": {
+    "message": "$PLAN$ 7 dienu izmēģinājums tiks pārveidots par maksas abonementu pēc 7 dienām.",
+    "placeholders": {
+      "plan": {
+        "content": "$1",
+        "example": "Teams"
+      }
+    }
+  },
+  "trialConfirmationEmail": {
+    "message": "Mēs nosūtījām apstiprinājuma e-pasta ziņojumu uz Tavas komandas rēķinu e-pasta adresi "
+  },
   "monthly": {
     "message": "Katru mēnesi"
   },
   "annually": {
     "message": "Katru gadu"
   },
+  "annual": {
+    "message": "Ikgadējs"
+  },
   "basePrice": {
     "message": "Pamata cena"
   },
@@ -2241,11 +2280,11 @@
   "removeUserConfirmation": {
     "message": "Vai tiešām noņemt šo lietotāju?"
   },
-  "deactivateUserConfirmation": {
-    "message": "The member will no longer have access to the organization, but will still have access to their individual vault."
+  "removeOrgUserConfirmation": {
+    "message": "When a member is removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again."
   },
-  "activateUserConfirmation": {
-    "message": "Are you sure you want to activate this user, granting them access to the organization?"
+  "revokeUserConfirmation": {
+    "message": "When a member is revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Uzmanību! Šim lietotājam ir nepieciešams Key Connector, lai pārvaldītu šifrēšanu. Lietotāja noņemšana no apvienības neatgriezeniski atspējos viņa kontu. Šī darbība nevar tikt atdarīta. Vai turpināt?"
@@ -2592,8 +2631,8 @@
       }
     }
   },
-  "deactivatedUserId": {
-    "message": "Deactivated user $ID$.",
+  "removeUserIdAccess": {
+    "message": "Remove $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2601,8 +2640,8 @@
       }
     }
   },
-  "activatedUserId": {
-    "message": "Activated user $ID$.",
+  "revokedUserId": {
+    "message": "Revoked organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2610,8 +2649,8 @@
       }
     }
   },
-  "deactivateUserId": {
-    "message": "Deactivate user $ID$?",
+  "restoredUserId": {
+    "message": "Restored organization access for $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2619,8 +2658,8 @@
       }
     }
   },
-  "activateUserId": {
-    "message": "Activate user $ID$?",
+  "revokeUserId": {
+    "message": "Revoke $ID$ access",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3684,8 +3723,8 @@
   "disabled": {
     "message": "Atspējots"
   },
-  "deactivated": {
-    "message": "Deactivated"
+  "revoked": {
+    "message": "Revoked"
   },
   "sendLink": {
     "message": "\"Send\" saite",
@@ -4288,11 +4327,11 @@
   "removeUsersWarning": {
     "message": "Vai tiešām noņemt šos lietotājus? Tas var aizņemt dažas sekundes un nevar tikt pārtraukts vai atcelts."
   },
-  "deactivateUsersWarning": {
-    "message": "Are you sure you want to deactivate the following members? They will no longer have access to the organization, but will still have access to their individual vaults. The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "removeOrgUsersConfirmation": {
+    "message": "When member(s) are removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
-  "activateUsersWarning": {
-    "message": "Are you sure you want to activate the following members, granting them access to the organization? The process may take a few seconds to complete and cannot be interrupted or canceled."
+  "revokeUsersWarning": {
+    "message": "When member(s) are revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab. The process may take a few seconds to complete and cannot be interrupted or canceled."
   },
   "theme": {
     "message": "Izskats"
@@ -4324,11 +4363,11 @@
   "bulkRemovedMessage": {
     "message": "Veiksmīgi noņemts"
   },
-  "bulkDeactivatedMessage": {
-    "message": "Deactivated successfully"
+  "bulkRevokedMessage": {
+    "message": "Revoked organization access successfully"
   },
-  "bulkActivatedMessage": {
-    "message": "Activated successfully"
+  "bulkRestoredMessage": {
+    "message": "Restored organization access successfully"
   },
   "bulkFilteredMessage": {
     "message": "Nav iekļauts, tādēļ nav piemērojams šai darbībai."
@@ -4339,11 +4378,11 @@
   "removeUsers": {
     "message": "Noņemt lietotājus"
   },
-  "deactivateUsers": {
-    "message": "Deactivate Users"
+  "revokeUsers": {
+    "message": "Revoke Users"
   },
-  "activateUsers": {
-    "message": "Activate Users"
+  "restoreUsers": {
+    "message": "Restore Users"
   },
   "error": {
     "message": "Kļūda"
@@ -4755,9 +4794,6 @@
   "sponsorshipCreated": {
     "message": "Izveidota pabalstītājdarbība"
   },
-  "revoke": {
-    "message": "Atsaukt"
-  },
   "emailSent": {
     "message": "E-pasts nosūtīts"
   },
@@ -5184,6 +5220,60 @@
       }
     }
   },
+  "scim": {
+    "message": "SCIM Provisioning",
+    "description": "The text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimDescription": {
+    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDesc": {
+    "message": "Enable SCIM",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimEnabledCheckboxDescHelpText": {
+    "message": "Set up your preferred identity provider by configuring the URL and SCIM API Key",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
+  "scimApiKeyHelperText": {
+    "message": "This API key has access to manage users within your organization. It should be kept secret."
+  },
+  "copyScimKey": {
+    "message": "Copy the SCIM API Key to your clipboard",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKey": {
+    "message": "Rotate the SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateScimKeyWarning": {
+    "message": "Are you sure you want to rotate the SCIM API Key? The current key will no longer work for any existing integrations.",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "rotateKey": {
+    "message": "Rotate Key"
+  },
+  "scimApiKey": {
+    "message": "SCIM API Key",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "copyScimUrl": {
+    "message": "Copy the SCIM endpoint URL to your clipboard",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimUrl": {
+    "message": "SCIM URL",
+    "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
+  },
+  "scimApiKeyRotated": {
+    "message": "The SCIM API Key has been successfully rotated",
+    "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
+  },
+  "scimSettingsSaved": {
+    "message": "SCIM settings have been saved successfully",
+    "description": "the text, 'SCIM', is an acronymn and should not be translated."
+  },
   "inputRequired": {
     "message": "Input is required."
   },
@@ -5213,5 +5303,8 @@
   },
   "on": {
     "message": "Ieslēgts"
+  },
+  "cardBrandMir": {
+    "message": "Mir"
   }
 }