More work on the decoupling. It is not currently in a working state

.dockerignore

@@ -1,3 +1,4 @@
 *
+!docker/*
 !build/*
 !entrypoint.sh

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
     outputs:
       release_version: ${{ steps.version.outputs.package }}
       tag_version: ${{ steps.version.outputs.tag }}
-      branch_name: ${{ steps.branch.outputs.branch_name }}
+      branch-name: ${{ steps.branch.outputs.branch-name }}
     steps:
       - name: Branch check
         run: |
@@ -55,14 +55,14 @@ jobs:
         id: branch
         run: |
           BRANCH_NAME=$(basename ${{ github.ref }})
-          echo "::set-output name=branch_name::$BRANCH_NAME"
+          echo "::set-output name=branch-name::$BRANCH_NAME"
 
   self-host:
     name: Release self-host docker
     runs-on: ubuntu-20.04
     needs: setup
     env:
-      _BRANCH_NAME: ${{ needs.setup.outputs.branch_name }}
+      _BRANCH_NAME: ${{ needs.setup.outputs.branch-name }}
       _RELEASE_VERSION: ${{ needs.setup.outputs.release_version }}
     steps:
       - name: Print environment
@@ -139,7 +139,7 @@ jobs:
         with:
           workflow: build.yml
           workflow_conclusion: success
-          branch: ${{ needs.setup.outputs.branch_name }}
+          branch: ${{ needs.setup.outputs.branch-name }}
           artifacts: web-*-cloud-COMMERCIAL.zip
 
       # This should result in a build directory in the current working directory
@@ -179,7 +179,7 @@ jobs:
         with:
           workflow: build.yml
           workflow_conclusion: success
-          branch: ${{ needs.setup.outputs.branch_name }}
+          branch: ${{ needs.setup.outputs.branch-name }}
           artifacts: "web-*-selfhosted-COMMERCIAL.zip,
             web-*-selfhosted-open-source.zip"
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM bitwarden/server:dev
+FROM nginx:stable
 
 LABEL com.bitwarden.product="bitwarden"
 
@@ -8,13 +8,29 @@ RUN apt-get update \
         curl \
 && rm -rf /var/lib/apt/lists/*
 
-ENV ASPNETCORE_URLS http://+:5000
+COPY docker/nginx.conf /etc/nginx
+COPY docker/nginx-web.conf /etc/nginx
+COPY docker/mime.types /etc/nginx
+COPY docker/security-headers.conf /etc/nginx
+
 WORKDIR /app
-EXPOSE 5000
 COPY ./build .
-COPY entrypoint.sh /
+COPY docker/entrypoint.sh /
 RUN chmod +x /entrypoint.sh
 
-HEALTHCHECK CMD curl -f http://localhost:5000 || exit 1
+RUN bash /entrypoint.sh
+RUN chown -R bitwarden:bitwarden /app && chmod -R 755 /app && \
+    chown -R bitwarden:bitwarden /var/cache/nginx && \
+    chown -R bitwarden:bitwarden /var/log/nginx && \
+    chown -R bitwarden:bitwarden /etc/nginx/conf.d
+RUN touch /var/run/nginx.pid && \
+    chown -R bitwarden:bitwarden /var/run/nginx.pid
 
-ENTRYPOINT ["/entrypoint.sh"]
+USER bitwarden
+
+EXPOSE 8080
+HEALTHCHECK CMD curl -f http://localhost:8080 || exit 1
+
+#ENTRYPOINT ["/entrypoint.sh"]
+#CMD ["tail", "-f", "/dev/null"]
+CMD nginx -g 'daemon off;'

bitwarden_license/src/app/organizations/manage/sso.component.html

@@ -71,7 +71,7 @@
           target="_blank"
           rel="noopener"
           appA11yTitle="{{ 'learnMore' | i18n }}"
-          href="https://bitwarden.com/help/about-key-connector/"
+          href="https://bitwarden.com/help/article/about-key-connector/"
         >
           <i class="bwi bwi-question-circle" aria-hidden="true"></i>
         </a>
@@ -313,15 +313,15 @@
       <div class="form-group">
         <label for="spNameIdFormat">{{ "spNameIdFormat" | i18n }}</label>
         <select class="form-control" formControlName="spNameIdFormat" id="spNameIdFormat">
-          <option [ngValue]="0">Not Configured</option>
-          <option [ngValue]="1">Unspecified</option>
-          <option [ngValue]="2">Email Address</option>
-          <option [ngValue]="3">X.509 Subject Name</option>
-          <option [ngValue]="4">Windows Domain Qualified Name</option>
-          <option [ngValue]="5">Kerberos Principal Name</option>
-          <option [ngValue]="6">Entity Identifier</option>
-          <option [ngValue]="7">Persistent</option>
-          <option [ngValue]="8">Transient</option>
+          <option value="0">Not Configured</option>
+          <option value="1">Unspecified</option>
+          <option value="2">Email Address</option>
+          <option value="3">X.509 Subject Name</option>
+          <option value="4">Windows Domain Qualified Name</option>
+          <option value="5">Kerberos Principal Name</option>
+          <option value="6">Entity Identifier</option>
+          <option value="7">Persistent</option>
+          <option value="8">Transient</option>
         </select>
       </div>
       <div class="form-group">
@@ -337,9 +337,9 @@
       <div class="form-group">
         <label for="spSigningBehavior">{{ "spSigningBehavior" | i18n }}</label>
         <select class="form-control" formControlName="spSigningBehavior" id="spSigningBehavior">
-          <option [ngValue]="0">If IdP Wants Authn Requests Signed</option>
-          <option [ngValue]="1">Always</option>
-          <option [ngValue]="3">Never</option>
+          <option value="0">If IdP Wants Authn Requests Signed</option>
+          <option value="1">Always</option>
+          <option value="3">Never</option>
         </select>
       </div>
       <div class="form-group">
@@ -393,9 +393,9 @@
       <div class="form-group">
         <label for="idpBindingType">{{ "idpBindingType" | i18n }}</label>
         <select class="form-control" formControlName="idpBindingType" id="idpBindingType">
-          <option [ngValue]="1">Redirect</option>
-          <option [ngValue]="2">HTTP POST</option>
-          <option [ngValue]="4">Artifact</option>
+          <option value="1">Redirect</option>
+          <option value="2">HTTP POST</option>
+          <option value="4">Artifact</option>
         </select>
       </div>
       <div class="form-group">
@@ -443,8 +443,7 @@
           <option *ngFor="let o of samlSigningAlgorithms" [ngValue]="o">{{ o }}</option>
         </select>
       </div>
-      <div class="form-group" [hidden]="true">
-        <!--TODO: Unhide once Unsolicited IdP Response is supported-->
+      <div class="form-group">
         <div class="form-check">
           <input
             class="form-check-input"

bitwarden_license/src/app/providers/manage/user-add-edit.component.html

@@ -52,7 +52,7 @@
             target="_blank"
             rel="noopener"
             appA11yTitle="{{ 'learnMore' | i18n }}"
-            href="https://bitwarden.com/help/provider-users/"
+            href="https://bitwarden.com/help/article/user-types-access-control/#user-types"
           >
             <i class="bwi bwi-question-circle" aria-hidden="true"></i>
           </a>

docker/entrypoint.sh

@@ -32,7 +32,6 @@ mkhomedir_helper $USERNAME
 chown -R $USERNAME:$GROUPNAME /etc/bitwarden
 cp /etc/bitwarden/web/app-id.json /app/app-id.json
 chown -R $USERNAME:$GROUPNAME /app
-chown -R $USERNAME:$GROUPNAME /bitwarden_server
+#chown -R $USERNAME:$GROUPNAME /bitwarden_server
 
-exec gosu $USERNAME:$GROUPNAME dotnet /bitwarden_server/Server.dll \
-    /contentRoot=/app /webRoot=. /serveUnknown=false /webVault=true
+#exec nginx -g 'daemon off;'

docker/mime.types

@@ -0,0 +1,138 @@
+types {
+
+  # Data interchange
+
+    application/atom+xml                  atom;
+    application/json                      json map topojson;
+    application/ld+json                   jsonld;
+    application/rss+xml                   rss;
+    application/vnd.geo+json              geojson;
+    application/xml                       rdf xml;
+
+
+  # JavaScript
+
+    # Normalize to standard type.
+    # https://tools.ietf.org/html/rfc4329#section-7.2
+    application/javascript                js;
+
+
+  # Manifest files
+
+    application/manifest+json             webmanifest;
+    application/x-web-app-manifest+json   webapp;
+    text/cache-manifest                   appcache;
+
+
+  # Media files
+
+    audio/midi                            mid midi kar;
+    audio/mp4                             aac f4a f4b m4a;
+    audio/mpeg                            mp3;
+    audio/ogg                             oga ogg opus;
+    audio/x-realaudio                     ra;
+    audio/x-wav                           wav;
+    image/bmp                             bmp;
+    image/gif                             gif;
+    image/jpeg                            jpeg jpg;
+    image/jxr                             jxr hdp wdp;
+    image/png                             png;
+    image/svg+xml                         svg svgz;
+    image/tiff                            tif tiff;
+    image/vnd.wap.wbmp                    wbmp;
+    image/webp                            webp;
+    image/x-jng                           jng;
+    video/3gpp                            3gp 3gpp;
+    video/mp4                             f4p f4v m4v mp4;
+    video/mpeg                            mpeg mpg;
+    video/ogg                             ogv;
+    video/quicktime                       mov;
+    video/webm                            webm;
+    video/x-flv                           flv;
+    video/x-mng                           mng;
+    video/x-ms-asf                        asf asx;
+    video/x-ms-wmv                        wmv;
+    video/x-msvideo                       avi;
+
+    # Serving `.ico` image files with a different media type
+    # prevents Internet Explorer from displaying then as images:
+    # https://github.com/h5bp/html5-boilerplate/commit/37b5fec090d00f38de64b591bcddcb205aadf8ee
+
+    image/x-icon                          cur ico;
+
+
+  # Microsoft Office
+
+    application/msword                                                         doc;
+    application/vnd.ms-excel                                                   xls;
+    application/vnd.ms-powerpoint                                              ppt;
+    application/vnd.openxmlformats-officedocument.wordprocessingml.document    docx;
+    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet          xlsx;
+    application/vnd.openxmlformats-officedocument.presentationml.presentation  pptx;
+
+
+  # Web fonts
+
+    application/font-woff                 woff;
+    application/font-woff2                woff2;
+    application/vnd.ms-fontobject         eot;
+
+    # Browsers usually ignore the font media types and simply sniff
+    # the bytes to figure out the font type.
+    # https://mimesniff.spec.whatwg.org/#matching-a-font-type-pattern
+    #
+    # However, Blink and WebKit based browsers will show a warning
+    # in the console if the following font types are served with any
+    # other media types.
+
+    application/x-font-ttf                ttc ttf;
+    font/opentype                         otf;
+
+
+  # Other
+
+    application/java-archive              ear jar war;
+    application/mac-binhex40              hqx;
+    application/octet-stream              bin deb dll dmg exe img iso msi msm msp safariextz;
+    application/pdf                       pdf;
+    application/postscript                ai eps ps;
+    application/rtf                       rtf;
+    application/vnd.google-earth.kml+xml  kml;
+    application/vnd.google-earth.kmz      kmz;
+    application/vnd.wap.wmlc              wmlc;
+    application/x-7z-compressed           7z;
+    application/x-bb-appworld             bbaw;
+    application/x-bittorrent              torrent;
+    application/x-chrome-extension        crx;
+    application/x-cocoa                   cco;
+    application/x-java-archive-diff       jardiff;
+    application/x-java-jnlp-file          jnlp;
+    application/x-makeself                run;
+    application/x-opera-extension         oex;
+    application/x-perl                    pl pm;
+    application/x-pilot                   pdb prc;
+    application/x-rar-compressed          rar;
+    application/x-redhat-package-manager  rpm;
+    application/x-sea                     sea;
+    application/x-shockwave-flash         swf;
+    application/x-stuffit                 sit;
+    application/x-tcl                     tcl tk;
+    application/x-x509-ca-cert            crt der pem;
+    application/x-xpinstall               xpi;
+    application/xhtml+xml                 xhtml;
+    application/xslt+xml                  xsl;
+    application/zip                       zip;
+    text/css                              css;
+    text/csv                              csv;
+    text/html                             htm html shtml;
+    text/markdown                         md;
+    text/mathml                           mml;
+    text/plain                            txt;
+    text/vcard                            vcard vcf;
+    text/vnd.rim.location.xloc            xloc;
+    text/vnd.sun.j2me.app-descriptor      jad;
+    text/vnd.wap.wml                      wml;
+    text/vtt                              vtt;
+    text/x-component                      htc;
+
+}

docker/nginx-web.conf

@@ -0,0 +1,25 @@
+#######################################################################
+# WARNING: This file is generated. Do not make changes to this file.  #
+# They will be overwritten on update. You can manage various settings #
+# used in this file from the ./bwdata/config.yml file for your        #
+# installation.                                                       #
+#######################################################################
+
+server {
+  listen 8080 default_server;
+  listen [::]:8080 default_server;
+  include /etc/nginx/security-headers.conf;
+
+  location / {
+    root /app;
+    index index.html index.htm;
+    include /etc/nginx/security-headers.conf;
+    add_header X-Frame-Options SAMEORIGIN;
+    add_header X-Robots-Tag "noindex, nofollow";
+  }
+
+  location /alive {
+    return 200 'alive';
+    add_header Content-Type text/plain;
+  }
+}

docker/nginx.conf

@@ -0,0 +1,147 @@
+# nginx Configuration File
+# http://wiki.nginx.org/Configuration
+
+# Run as a less privileged user for security reasons.
+# user www www;
+
+# How many worker threads to run;
+# "auto" sets it to the number of CPU cores available in the system, and
+# offers the best performance. Don't set it higher than the number of CPU
+# cores if changing this parameter.
+
+# The maximum number of connections for Nginx is calculated by:
+# max_clients = worker_processes * worker_connections
+worker_processes auto;
+
+# Maximum open file descriptors per process;
+# should be > worker_connections.
+worker_rlimit_nofile 8192;
+
+events {
+  # When you need > 8000 * cpu_cores connections, you start optimizing your OS,
+  # and this is probably the point at which you hire people who are smarter than
+  # you, as this is *a lot* of requests.
+  worker_connections 8000;
+}
+
+# Default error log file
+# (this is only used when you don't override error_log on a server{} level)
+error_log  /var/log/nginx/error.log warn;
+pid        /var/run/nginx.pid;
+
+http {
+  # Hide nginx version information.
+  server_tokens off;
+
+  # Define the MIME types for files.
+  include       mime.types;
+  default_type  application/octet-stream;
+
+  # Update charset_types to match updated mime.types.
+  # text/html is always included by charset module.
+  # Default: text/html text/xml text/plain text/vnd.wap.wml application/javascript application/rss+xml
+  charset_types
+    text/css
+    text/plain
+    text/vnd.wap.wml
+    application/javascript
+    application/json
+    application/rss+xml
+    application/xml;
+
+  # Format to use in log files
+  log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                    '$status $body_bytes_sent "$http_referer" '
+                    '"$http_user_agent" "$http_x_forwarded_for"';
+
+  # Default log file
+  # (this is only used when you don't override access_log on a server{} level)
+  access_log /var/log/nginx/access.log main;
+
+  # How long to allow each connection to stay idle; longer values are better
+  # for each individual client, particularly for SSL, but means that worker
+  # connections are tied up longer. (Default: 65)
+  keepalive_timeout 20;
+
+  # Speed up file transfers by using sendfile() to copy directly
+  # between descriptors rather than using read()/write().
+  # For performance reasons, on FreeBSD systems w/ ZFS 
+  # this option should be disabled as ZFS's ARC caches
+  # frequently used files in RAM by default.
+  sendfile        on;
+
+  # Tell Nginx not to send out partial frames; this increases throughput
+  # since TCP frames are filled up before being sent out. (adds TCP_CORK)
+  tcp_nopush      on;
+
+
+  # Compression
+
+  # Enable Gzip compressed.
+  gzip on;
+
+  # Compression level (1-9).
+  # 5 is a perfect compromise between size and cpu usage, offering about
+  # 75% reduction for most ascii files (almost identical to level 9).
+  gzip_comp_level    5;
+
+  # Don't compress anything that's already small and unlikely to shrink much
+  # if at all (the default is 20 bytes, which is bad as that usually leads to
+  # larger files after gzipping).
+  gzip_min_length    256;
+
+  # Compress data even for clients that are connecting to us via proxies,
+  # identified by the "Via" header (required for CloudFront).
+  gzip_proxied       any;
+
+  # Tell proxies to cache both the gzipped and regular version of a resource
+  # whenever the client's Accept-Encoding capabilities header varies;
+  # Avoids the issue where a non-gzip capable client (which is extremely rare
+  # today) would display gibberish if their proxy gave them the gzipped version.
+  gzip_vary          on;
+
+  # Compress all output labeled with one of the following MIME-types.
+  gzip_types
+    application/atom+xml
+    application/javascript
+    application/json
+    application/ld+json
+    application/manifest+json
+    application/rss+xml
+    application/vnd.geo+json
+    application/vnd.ms-fontobject
+    application/x-font-ttf
+    application/x-web-app-manifest+json
+    application/xhtml+xml
+    application/xml
+    font/opentype
+    image/bmp
+    image/svg+xml
+    image/x-icon
+    text/cache-manifest
+    text/css
+    text/plain
+    text/vcard
+    text/vnd.rim.location.xloc
+    text/vtt
+    text/x-component
+    text/x-cross-domain-policy;
+  # text/html is always compressed by HttpGzipModule
+
+  # This should be turned on if you are going to have pre-compressed copies (.gz) of
+  # static files available. If not it should be left off as it will cause extra I/O
+  # for the check. It is best if you enable this in a location{} block for
+  # a specific directory, or on an individual server{} level.
+  # gzip_static on;
+  
+  # Content type for FIDO U2F facets
+  map $uri $fido_content_type {
+    default "application/fido.trusted-apps+json";
+  }
+
+  # Include files in the sites-enabled folder. server{} configuration files should be
+  # placed in the sites-available folder, and then the configuration should be enabled
+  # by creating a symlink to it in the sites-enabled folder.
+  # See doc/sites-enabled.md for more info.
+  include conf.d/*.conf;
+}

docker/security-headers.conf

@@ -0,0 +1,3 @@
+add_header Referrer-Policy same-origin;
+add_header X-Content-Type-Options nosniff;
+add_header X-XSS-Protection "1; mode=block";

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@bitwarden/web-vault",
-  "version": "2.26.2",
+  "version": "2.25.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@bitwarden/web-vault",
-      "version": "2.26.2",
+      "version": "2.25.1",
       "hasInstallScript": true,
       "license": "GPL-3.0",
       "dependencies": {
@@ -26,6 +26,7 @@
         "browser-hrtime": "^1.1.8",
         "core-js": "^3.11.0",
         "date-input-polyfill": "^2.14.0",
+        "font-awesome": "4.7.0",
         "jquery": "3.6.0",
         "ngx-infinite-scroll": "^10.0.1",
         "ngx-toastr": "14.1.4",
@@ -3250,6 +3251,14 @@
         }
       }
     },
+    "node_modules/font-awesome": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
+      "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=",
+      "engines": {
+        "node": ">=0.10.3"
+      }
+    },
     "node_modules/foreach": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
@@ -10251,6 +10260,11 @@
       "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==",
       "dev": true
     },
+    "font-awesome": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
+      "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM="
+    },
     "foreach": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bitwarden/web-vault",
-  "version": "2.26.2",
+  "version": "2.25.1",
   "license": "GPL-3.0",
   "repository": "https://github.com/bitwarden/web",
   "scripts": {
@@ -85,6 +85,7 @@
     "browser-hrtime": "^1.1.8",
     "core-js": "^3.11.0",
     "date-input-polyfill": "^2.14.0",
+    "font-awesome": "4.7.0",
     "jquery": "3.6.0",
     "ngx-infinite-scroll": "^10.0.1",
     "ngx-toastr": "14.1.4",

src/abstractions/state.service.ts

@@ -1,10 +0,0 @@
-import { StateService as BaseStateService } from "jslib-common/abstractions/state.service";
-
-import { StorageOptions } from "jslib-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>;
-}

src/app/accounts/login.component.html

@@ -86,7 +86,7 @@
               [queryParams]="{ email: email }"
               class="btn btn-outline-secondary btn-block ml-2 mt-0"
             >
-              <i class="bwi bwi-pencil-square" aria-hidden="true"></i>
+              <i class="bwi bwi-pencil-square-o" aria-hidden="true"></i>
               {{ "createAccount" | i18n }}
             </a>
           </div>

src/app/accounts/login.component.ts

@@ -12,16 +12,11 @@ import { LogService } from "jslib-common/abstractions/log.service";
 import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { PolicyService } from "jslib-common/abstractions/policy.service";
-
-import { StateService } from "../../abstractions/state.service";
+import { StateService } from "jslib-common/abstractions/state.service";
 
 import { LoginComponent as BaseLoginComponent } from "jslib-angular/components/login.component";
 
-import { PolicyData } from "jslib-common/models/data/policyData";
-import { MasterPasswordPolicyOptions } from "jslib-common/models/domain/masterPasswordPolicyOptions";
 import { Policy } from "jslib-common/models/domain/policy";
-import { ListResponse } from "jslib-common/models/response/listResponse";
-import { PolicyResponse } from "jslib-common/models/response/policyResponse";
 
 @Component({
   selector: "app-login",
@@ -29,14 +24,13 @@ import { PolicyResponse } from "jslib-common/models/response/policyResponse";
 })
 export class LoginComponent extends BaseLoginComponent {
   showResetPasswordAutoEnrollWarning = false;
-  enforcedPasswordPolicyOptions: MasterPasswordPolicyOptions;
-  policies: ListResponse<PolicyResponse>;
 
   constructor(
     authService: AuthService,
     router: Router,
     i18nService: I18nService,
     private route: ActivatedRoute,
+    stateService: StateService,
     platformUtilsService: PlatformUtilsService,
     environmentService: EnvironmentService,
     passwordGenerationService: PasswordGenerationService,
@@ -44,8 +38,7 @@ export class LoginComponent extends BaseLoginComponent {
     private apiService: ApiService,
     private policyService: PolicyService,
     logService: LogService,
-    ngZone: NgZone,
-    protected stateService: StateService
+    ngZone: NgZone
   ) {
     super(
       authService,
@@ -85,64 +78,35 @@ export class LoginComponent extends BaseLoginComponent {
         });
       }
       await super.ngOnInit();
-      this.rememberEmail = await this.stateService.getRememberEmail();
     });
 
     const invite = await this.stateService.getOrganizationInvitation();
     if (invite != null) {
       let policyList: Policy[] = null;
       try {
-        this.policies = await this.apiService.getPoliciesByToken(
+        const policies = await this.apiService.getPoliciesByToken(
           invite.organizationId,
           invite.token,
           invite.email,
           invite.organizationUserId
         );
-        policyList = this.policyService.mapPoliciesFromToken(this.policies);
+        policyList = this.policyService.mapPoliciesFromToken(policies);
       } catch (e) {
         this.logService.error(e);
       }
 
       if (policyList != null) {
-        const resetPasswordPolicy = this.policyService.getResetPasswordPolicyOptions(
+        const result = this.policyService.getResetPasswordPolicyOptions(
           policyList,
           invite.organizationId
         );
         // Set to true if policy enabled and auto-enroll enabled
-        this.showResetPasswordAutoEnrollWarning =
-          resetPasswordPolicy[1] && resetPasswordPolicy[0].autoEnrollEnabled;
-
-        this.enforcedPasswordPolicyOptions =
-          await this.policyService.getMasterPasswordPolicyOptions(policyList);
+        this.showResetPasswordAutoEnrollWarning = result[1] && result[0].autoEnrollEnabled;
       }
     }
   }
 
   async goAfterLogIn() {
-    // Check master password against policy
-    if (this.enforcedPasswordPolicyOptions != null) {
-      const strengthResult = this.passwordGenerationService.passwordStrength(
-        this.masterPassword,
-        this.getPasswordStrengthUserInput()
-      );
-      const masterPasswordScore = strengthResult == null ? null : strengthResult.score;
-
-      // If invalid, save policies and require update
-      if (
-        !this.policyService.evaluateMasterPassword(
-          masterPasswordScore,
-          this.masterPassword,
-          this.enforcedPasswordPolicyOptions
-        )
-      ) {
-        const policiesData: { [id: string]: PolicyData } = {};
-        this.policies.data.map((p) => (policiesData[p.id] = new PolicyData(p)));
-        await this.policyService.replace(policiesData);
-        this.router.navigate(["update-password"]);
-        return;
-      }
-    }
-
     const loginRedirect = await this.stateService.getLoginRedirect();
     if (loginRedirect != null) {
       this.router.navigate([loginRedirect.route], { queryParams: loginRedirect.qParams });
@@ -151,27 +115,4 @@ export class LoginComponent extends BaseLoginComponent {
       this.router.navigate([this.successRoute]);
     }
   }
-
-  async submit() {
-    await this.stateService.setRememberEmail(this.rememberEmail);
-    if (!this.rememberEmail) {
-      await this.stateService.setRememberedEmail(null);
-    }
-    await super.submit();
-  }
-
-  private getPasswordStrengthUserInput() {
-    let userInput: string[] = [];
-    const atPosition = this.email.indexOf("@");
-    if (atPosition > -1) {
-      userInput = userInput.concat(
-        this.email
-          .substr(0, atPosition)
-          .trim()
-          .toLowerCase()
-          .split(/[^A-Za-z0-9]/)
-      );
-    }
-    return userInput;
-  }
 }

src/app/accounts/recover-two-factor.component.html

@@ -7,7 +7,7 @@
           <p>
             {{ "recoverAccountTwoStepDesc" | i18n }}
             <a
-              href="https://bitwarden.com/help/lost-two-step-device/"
+              href="https://help.bitwarden.com/article/lost-two-step-device/"
               target="_blank"
               rel="noopener"
               >{{ "learnMore" | i18n }}</a

src/app/accounts/register.component.html

@@ -1,100 +1,44 @@
 <div class="layout" [ngClass]="['layout', layout]">
-  <!-- TEAMS 1 Header -->
-  <header
-    class="header"
-    *ngIf="
-      layout === 'default' ||
-      layout === 'teams' ||
-      layout === 'teams1' ||
-      layout === 'teams2' ||
-      layout === 'enterprise' ||
-      layout === 'enterprise1' ||
-      layout === 'enterprise2' ||
-      layout === 'cnetcmpgnent' ||
-      layout === 'cnetcmpgnteams' ||
-      layout === 'cnetcmpgnind'
-    "
-  >
+  <header class="header" *ngIf="layout === 'enterprise2'">
     <div class="container">
       <div class="row">
         <div class="col-7">
           <img
             alt="Bitwarden"
             class="logo mb-2"
-            src="../../images/register-layout/logo-horizontal-white.svg"
+            src="../../images/register-layout/logo-horizontal-white.png"
           />
         </div>
       </div>
     </div>
   </header>
-
   <form #form (ngSubmit)="submit()" [appApiAction]="formPromise" class="container" ngNativeValidate>
     <div class="row">
       <div class="col-7" *ngIf="layout">
         <div class="mt-5">
-          <!-- Default Body -->
-          <div
-            *ngIf="
-              layout === 'teams' ||
-              layout === 'enterprise' ||
-              layout === 'enterprise1' ||
-              layout === 'default'
-            "
-          >
-            <h1>The Bitwarden Password Manager</h1>
-            <h2>
-              Trusted by millions of individuals, teams, and organizations worldwide for secure
-              password storage and sharing.
-            </h2>
-            <p>Store logins, secure notes, and more</p>
+          <div *ngIf="layout === 'enterprise2'">
+            <h2>Companies globally trust Bitwarden for password management.</h2>
+            <p>Start your 7-day free trial!</p>
+            <p class="highlight">Quickly deploy your <b>organization</b></p>
+            <p>Use Bitwarden across all platforms</p>
             <p>Collaborate and share securely</p>
-            <p>Access anywhere on any device</p>
-            <p>Create your account to get started</p>
+            <figure>
+              <figcaption>
+                <cite>
+                  <img src="../../images/register-layout/wired-logo.png" alt="Wired" />
+                </cite>
+              </figcaption>
+              <blockquote>
+                "Bitwarden has become a popular choice among open-source software advocates. After
+                using it for a few months, I can see why." - February 2020
+              </blockquote>
+            </figure>
           </div>
-
-          <!-- Teams & Enterprise Body -->
-          <div *ngIf="layout === 'teams1' || layout === 'teams2' || layout === 'enterprise2'">
-            <h1>
-              Start Your <span *ngIf="layout === 'teams1' || layout === 'teams1'">Teams<br /></span
-              ><span *ngIf="layout === 'enterprise2'">Enterprise</span> Free Trial Now
-            </h1>
-            <h2>
-              Millions of individuals, teams, and organizations worldwide trust Bitwarden for secure
-              password storage and sharing.
-            </h2>
-            <p>Collaborate and share securely</p>
-            <p>Deploy and manage quickly and easily</p>
-            <p>Access anywhere on any device</p>
-            <p>Create your account to get started</p>
+          <div *ngIf="layout === 'enterprise3'">
+            <p>Enterprise 3 layout</p>
           </div>
-
-          <!-- CNET Campaign Teams & Enterprise Body -->
-          <div *ngIf="layout === 'cnetcmpgnteams' || layout === 'cnetcmpgnent'">
-            <h1>
-              Start Your <span *ngIf="layout === 'cnetcmpgnteams'">Teams<br /></span
-              ><span *ngIf="layout === 'cnetcmpgnent'">Enterprise</span> Free Trial Now
-            </h1>
-            <h2>
-              Millions of individuals, teams, and organizations worldwide trust Bitwarden for secure
-              password storage and sharing.
-            </h2>
-            <p>Collaborate and share securely</p>
-            <p>Deploy and manage quickly and easily</p>
-            <p>Access anywhere on any device</p>
-            <p>Create your account to get started</p>
-          </div>
-
-          <!-- CNET Campaign Premium Body -->
-          <div *ngIf="layout === 'cnetcmpgnind'">
-            <h1>Start Your Premium Account Now</h1>
-            <h2>
-              Millions of individuals, teams, and organizations worldwide trust Bitwarden for secure
-              password storage and sharing.
-            </h2>
-            <p>Store logins, secure notes, and more</p>
-            <p>Secure your account with advanced two-step login</p>
-            <p>Access anywhere on any device</p>
-            <p>Create your account to get started</p>
+          <div *ngIf="layout === 'enterprise4'">
+            <p>Enterprise 4 layout</p>
           </div>
         </div>
       </div>
@@ -268,88 +212,5 @@
         </div>
       </div>
     </div>
-    <div class="row">
-      <div class="col-7 d-flex align-items-center">
-        <div
-          *ngIf="
-            layout === 'cnetcmpgnent' || layout === 'cnetcmpgnteams' || layout === 'cnetcmpgnind'
-          "
-        >
-          <figure>
-            <figcaption>
-              <cite>
-                <img
-                  src="../../images/register-layout/cnet-logo.svg"
-                  class="w-25 d-block mx-auto"
-                  alt="cnet logo"
-                />
-              </cite>
-            </figcaption>
-            <blockquote class="mx-auto text-center px-4">
-              "No more excuses; start using Bitwarden today. The identity you save could be your
-              own. The money definitely will be."
-            </blockquote>
-          </figure>
-        </div>
-
-        <div
-          *ngIf="
-            layout === 'teams' ||
-            layout === 'teams1' ||
-            layout === 'teams2' ||
-            layout === 'enterprise' ||
-            layout === 'enterprise1' ||
-            layout === 'enterprise2' ||
-            layout === 'default'
-          "
-        >
-          <figure>
-            <figcaption>
-              <cite>
-                <img
-                  src="../../images/register-layout/forbes-logo.svg"
-                  class="w-25 d-block mx-auto"
-                  alt="Forbes Logo"
-                />
-              </cite>
-            </figcaption>
-            <blockquote class="mx-auto text-center px-4">
-              “Bitwarden boasts the backing of some of the world's best security experts and an
-              attractive, easy-to-use interface”
-            </blockquote>
-          </figure>
-        </div>
-      </div>
-      <div
-        *ngIf="
-          layout === 'cnetcmpgnent' || layout === 'cnetcmpgnteams' || layout === 'cnetcmpgnind'
-        "
-        class="col-5 d-flex align-items-center justify-content-center"
-      >
-        <img
-          src="../../images/register-layout/usnews-360-badge.svg"
-          class="w-50 d-block"
-          alt="US News 360 Reviews Best Password Manager"
-        />
-      </div>
-      <div
-        *ngIf="
-          layout === 'teams' ||
-          layout === 'teams1' ||
-          layout === 'teams2' ||
-          layout === 'enterprise' ||
-          layout === 'enterprise1' ||
-          layout === 'enterprise2' ||
-          layout === 'default'
-        "
-        class="col-5 d-flex align-items-center justify-content-center"
-      >
-        <img
-          src="../../images/register-layout/usnews-360-badge.svg"
-          class="w-50 d-block"
-          alt="US News 360 Reviews Best Password Manager"
-        />
-      </div>
-    </div>
   </form>
 </div>

src/app/accounts/update-password.component.html

@@ -1,90 +0,0 @@
-<form #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate autocomplete="off">
-  <div class="row justify-content-md-center mt-5">
-    <div class="col-4">
-      <p class="lead text-center mb-4">{{ "updateMasterPassword" | i18n }}</p>
-      <div class="card d-block">
-        <div class="card-body">
-          <app-callout type="warning">{{ "masterPasswordInvalidWarning" | i18n }} </app-callout>
-          <app-callout
-            type="info"
-            [enforcedPolicyOptions]="enforcedPolicyOptions"
-            *ngIf="enforcedPolicyOptions"
-          ></app-callout>
-
-          <form
-            #form
-            (ngSubmit)="submit()"
-            [appApiAction]="formPromise"
-            ngNativeValidate
-            autocomplete="off"
-          >
-            <div class="row">
-              <div class="col-6">
-                <div class="form-group">
-                  <label for="currentMasterPassword">{{ "currentMasterPass" | i18n }}</label>
-                  <input
-                    id="currentMasterPassword"
-                    type="password"
-                    name="MasterPasswordHash"
-                    class="form-control"
-                    [(ngModel)]="currentMasterPassword"
-                    required
-                    appInputVerbatim
-                  />
-                </div>
-              </div>
-            </div>
-            <div class="row">
-              <div class="col-6">
-                <div class="form-group">
-                  <label for="newMasterPassword">{{ "newMasterPass" | i18n }}</label>
-                  <input
-                    id="newMasterPassword"
-                    type="password"
-                    name="NewMasterPasswordHash"
-                    class="form-control mb-1"
-                    [(ngModel)]="masterPassword"
-                    (input)="updatePasswordStrength()"
-                    required
-                    appInputVerbatim
-                    autocomplete="new-password"
-                  />
-                  <app-password-strength
-                    [score]="masterPasswordScore"
-                    [showText]="true"
-                  ></app-password-strength>
-                </div>
-              </div>
-              <div class="col-6">
-                <div class="form-group">
-                  <label for="masterPasswordRetype">{{ "confirmNewMasterPass" | i18n }}</label>
-                  <input
-                    id="masterPasswordRetype"
-                    type="password"
-                    name="MasterPasswordRetype"
-                    class="form-control"
-                    [(ngModel)]="masterPasswordRetype"
-                    required
-                    appInputVerbatim
-                    autocomplete="new-password"
-                  />
-                </div>
-              </div>
-            </div>
-            <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
-              <i
-                class="fa fa-spinner fa-spin"
-                title="{{ 'loading' | i18n }}"
-                aria-hidden="true"
-              ></i>
-              <span>{{ "changeMasterPassword" | i18n }}</span>
-            </button>
-            <button (click)="cancel()" type="button" class="btn btn-outline-secondary">
-              <span>{{ "cancel" | i18n }}</span>
-            </button>
-          </form>
-        </div>
-      </div>
-    </div>
-  </div>
-</form>

src/app/accounts/update-password.component.ts

@@ -1,52 +0,0 @@
-import { Component } from "@angular/core";
-import { ActivatedRoute, Router } from "@angular/router";
-
-import { first } from "rxjs/operators";
-
-import { ApiService } from "jslib-common/abstractions/api.service";
-import { CryptoService } from "jslib-common/abstractions/crypto.service";
-import { I18nService } from "jslib-common/abstractions/i18n.service";
-import { LogService } from "jslib-common/abstractions/log.service";
-import { MessagingService } from "jslib-common/abstractions/messaging.service";
-import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service";
-import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
-import { PolicyService } from "jslib-common/abstractions/policy.service";
-import { SyncService } from "jslib-common/abstractions/sync.service";
-
-import { UpdatePasswordComponent as BaseUpdatePasswordComponent } from "jslib-angular/components/update-password.component";
-import { StateService } from "jslib-common/abstractions/state.service";
-import { UserVerificationService } from "jslib-common/abstractions/userVerification.service";
-
-@Component({
-  selector: "app-update-password",
-  templateUrl: "update-password.component.html",
-})
-export class UpdatePasswordComponent extends BaseUpdatePasswordComponent {
-  constructor(
-    router: Router,
-    i18nService: I18nService,
-    platformUtilsService: PlatformUtilsService,
-    passwordGenerationService: PasswordGenerationService,
-    policyService: PolicyService,
-    cryptoService: CryptoService,
-    messagingService: MessagingService,
-    apiService: ApiService,
-    logService: LogService,
-    stateService: StateService,
-    userVerificationService: UserVerificationService
-  ) {
-    super(
-      router,
-      i18nService,
-      platformUtilsService,
-      passwordGenerationService,
-      policyService,
-      cryptoService,
-      messagingService,
-      apiService,
-      stateService,
-      userVerificationService,
-      logService
-    );
-  }
-}

src/app/app.component.ts

@@ -153,7 +153,7 @@ export class AppComponent implements OnDestroy, OnInit {
             );
             if (emailVerificationConfirmed) {
               this.platformUtilsService.launchUri(
-                "https://bitwarden.com/help/create-bitwarden-account/"
+                "https://bitwarden.com/help/article/create-bitwarden-account/"
               );
             }
             break;
@@ -210,6 +210,7 @@ export class AppComponent implements OnDestroy, OnInit {
     await Promise.all([
       this.eventService.clearEvents(),
       this.syncService.setLastSync(new Date(0)),
+      this.tokenService.clearToken(),
       this.cryptoService.clearKeys(),
       this.settingsService.clear(userId),
       this.cipherService.clear(userId),

src/app/organizations/manage/bulk/bulk-confirm.component.html

@@ -28,7 +28,11 @@
         <ng-container *ngIf="!loading && !done">
           <p>
             {{ "fingerprintEnsureIntegrityVerify" | i18n }}
-            <a href="https://bitwarden.com/help/fingerprint-phrase/" target="_blank" rel="noopener">
+            <a
+              href="https://help.bitwarden.com/article/fingerprint-phrase/"
+              target="_blank"
+              rel="noopener"
+            >
               {{ "learnMore" | i18n }}</a
             >
           </p>

src/app/organizations/manage/group-add-edit.component.html

@@ -56,7 +56,7 @@
               target="_blank"
               rel="noopener"
               appA11yTitle="{{ 'learnMore' | i18n }}"
-              href="https://bitwarden.com/help/user-types-access-control/#access-control"
+              href="https://bitwarden.com/help/article/user-types-access-control/#access-control"
             >
               <i class="bwi bwi-question-circle" aria-hidden="true"></i>
             </a>

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

@@ -52,7 +52,7 @@
             target="_blank"
             rel="noopener"
             appA11yTitle="{{ 'learnMore' | i18n }}"
-            href="https://bitwarden.com/help/provider-users/"
+            href="https://bitwarden.com/help/article/user-types-access-control/#user-types"
           >
             <i class="bwi bwi-question-circle" aria-hidden="true"></i>
           </a>
@@ -277,7 +277,7 @@
               target="_blank"
               rel="noopener"
               appA11yTitle="{{ 'learnMore' | i18n }}"
-              href="https://bitwarden.com/help/user-types-access-control/#access-control"
+              href="https://bitwarden.com/help/article/user-types-access-control/#access-control"
             >
               <i class="bwi bwi-question-circle" aria-hidden="true"></i>
             </a>

src/app/organizations/manage/user-confirm.component.html

@@ -18,7 +18,11 @@
       <div class="modal-body">
         <p>
           {{ "fingerprintEnsureIntegrityVerify" | i18n }}
-          <a href="https://bitwarden.com/help/fingerprint-phrase/" target="_blank" rel="noopener">
+          <a
+            href="https://help.bitwarden.com/article/fingerprint-phrase/"
+            target="_blank"
+            rel="noopener"
+          >
             {{ "learnMore" | i18n }}</a
           >
         </p>

src/app/organizations/settings/download-license.component.html

@@ -13,7 +13,7 @@
             target="_blank"
             rel="noopener"
             appA11yTitle="{{ 'learnMore' | i18n }}"
-            href="https://bitwarden.com/help/licensing-on-premise/#organization-account-sharing"
+            href="https://help.bitwarden.com/article/licensing-on-premise/#organization-account-sharing"
           >
             <i class="bwi bwi-question-circle" aria-hidden="true"></i>
           </a>

src/app/oss-routing.module.ts

@@ -17,7 +17,6 @@ import { RemovePasswordComponent } from "./accounts/remove-password.component";
 import { SetPasswordComponent } from "./accounts/set-password.component";
 import { SsoComponent } from "./accounts/sso.component";
 import { TwoFactorComponent } from "./accounts/two-factor.component";
-import { UpdatePasswordComponent } from "./accounts/update-password.component";
 import { UpdateTempPasswordComponent } from "./accounts/update-temp-password.component";
 import { VerifyEmailTokenComponent } from "./accounts/verify-email-token.component";
 import { VerifyRecoverDeleteComponent } from "./accounts/verify-recover-delete.component";
@@ -163,12 +162,6 @@ const routes: Routes = [
         canActivate: [AuthGuardService],
         data: { titleId: "updateTempPassword" },
       },
-      {
-        path: "update-password",
-        component: UpdatePasswordComponent,
-        canActivate: [AuthGuardService],
-        data: { titleId: "updatePassword" },
-      },
       {
         path: "remove-password",
         component: RemovePasswordComponent,

src/app/oss.module.ts

@@ -30,7 +30,6 @@ import { SetPasswordComponent } from "./accounts/set-password.component";
 import { SsoComponent } from "./accounts/sso.component";
 import { TwoFactorOptionsComponent } from "./accounts/two-factor-options.component";
 import { TwoFactorComponent } from "./accounts/two-factor.component";
-import { UpdatePasswordComponent } from "./accounts/update-password.component";
 import { UpdateTempPasswordComponent } from "./accounts/update-temp-password.component";
 import { VerifyEmailTokenComponent } from "./accounts/verify-email-token.component";
 import { VerifyRecoverDeleteComponent } from "./accounts/verify-recover-delete.component";
@@ -432,7 +431,6 @@ registerLocaleData(localeZhTw, "zh-TW");
     UpdateKeyComponent,
     UpdateLicenseComponent,
     UpdateTempPasswordComponent,
-    UpdatePasswordComponent,
     UserBillingComponent,
     UserLayoutComponent,
     UserSubscriptionComponent,

src/app/send/access.component.html

@@ -9,7 +9,7 @@
     <div class="col-8" *ngIf="hideEmail">
       <app-callout type="warning" title="{{ 'warning' | i18n }}">
         {{ "viewSendHiddenEmailWarning" | i18n }}
-        <a href="https://bitwarden.com/help/receive-send/" target="_blank">{{
+        <a href="https://bitwarden.com/help/article/receive-send/" target="_blank">{{
           "learnMore" | i18n
         }}</a
         >.

src/app/services/services.module.ts

@@ -7,7 +7,6 @@ import { I18nService } from "../../services/i18n.service";
 import { MemoryStorageService } from "../../services/memoryStorage.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 { EventService } from "./event.service";
@@ -46,23 +45,20 @@ import { MessagingService as MessagingServiceAbstraction } from "jslib-common/ab
 import { NotificationsService as NotificationsServiceAbstraction } from "jslib-common/abstractions/notifications.service";
 import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "jslib-common/abstractions/passwordReprompt.service";
 import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "jslib-common/abstractions/platformUtils.service";
-import { StateService as BaseStateServiceAbstraction } from "jslib-common/abstractions/state.service";
+import { StateService as StateServiceAbstraction } from "jslib-common/abstractions/state.service";
 import { StateMigrationService as StateMigrationServiceAbstraction } from "jslib-common/abstractions/stateMigration.service";
 import { StorageService as StorageServiceAbstraction } from "jslib-common/abstractions/storage.service";
 import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "jslib-common/abstractions/vaultTimeout.service";
 
 import { ThemeType } from "jslib-common/enums/themeType";
 
+import { AccountFactory } from "jslib-common/models/domain/account";
+
 import { Account } from "../../models/account";
-import { GlobalState } from "../../models/globalState";
-
-import { GlobalStateFactory } from "jslib-common/factories/globalStateFactory";
-import { StateFactory } from "jslib-common/factories/stateFactory";
-
-import { StateService as StateServiceAbstraction } from "../../abstractions/state.service";
 
 export function initFactory(
   window: Window,
+  storageService: StorageServiceAbstraction,
   environmentService: EnvironmentServiceAbstraction,
   notificationsService: NotificationsServiceAbstraction,
   vaultTimeoutService: VaultTimeoutService,
@@ -74,6 +70,7 @@ export function initFactory(
   cryptoService: CryptoServiceAbstraction
 ): Function {
   return async () => {
+    await (storageService as HtmlStorageService).init();
     await stateService.init();
 
     const urls = process.env.URLS as Urls;
@@ -113,6 +110,7 @@ export function initFactory(
       useFactory: initFactory,
       deps: [
         "WINDOW",
+        StorageServiceAbstraction,
         EnvironmentServiceAbstraction,
         NotificationsServiceAbstraction,
         VaultTimeoutServiceAbstraction,
@@ -182,19 +180,6 @@ export function initFactory(
         StateServiceAbstraction,
       ],
     },
-    {
-      provide: StateMigrationServiceAbstraction,
-      useFactory: (
-        storageService: StorageServiceAbstraction,
-        secureStorageService: StorageServiceAbstraction
-      ) =>
-        new StateMigrationService(
-          storageService,
-          secureStorageService,
-          new StateFactory(GlobalState, Account)
-        ),
-      deps: [StorageServiceAbstraction, "SECURE_STORAGE"],
-    },
     {
       provide: StateServiceAbstraction,
       useFactory: (
@@ -208,7 +193,7 @@ export function initFactory(
           secureStorageService,
           logService,
           stateMigrationService,
-          new StateFactory(GlobalState, Account)
+          new AccountFactory(Account)
         ),
       deps: [
         StorageServiceAbstraction,
@@ -217,10 +202,6 @@ export function initFactory(
         StateMigrationServiceAbstraction,
       ],
     },
-    {
-      provide: BaseStateServiceAbstraction,
-      useExisting: StateServiceAbstraction,
-    },
     {
       provide: PasswordRepromptServiceAbstraction,
       useClass: PasswordRepromptService,

src/app/settings/change-kdf.component.html

@@ -39,7 +39,7 @@
         <label for="kdfIterations">{{ "kdfIterations" | i18n }}</label>
         <a
           class="ml-auto"
-          href="https://bitwarden.com/help/what-encryption-is-used/#pbkdf2"
+          href="https://bitwarden.com/help/article/what-encryption-is-used/#pbkdf2"
           target="_blank"
           rel="noopener"
           appA11yTitle="{{ 'learnMore' | i18n }}"

src/app/settings/change-password.component.html

@@ -74,7 +74,7 @@
         {{ "rotateAccountEncKey" | i18n }}
       </label>
       <a
-        href="https://bitwarden.com/help/account-encryption-key/#rotate-your-encryption-key"
+        href="https://bitwarden.com/help/article/account-encryption-key/#rotate-your-encryption-key"
         target="_blank"
         rel="noopener"
         appA11yTitle="{{ 'learnMore' | i18n }}"

src/app/settings/change-password.component.ts

@@ -87,7 +87,7 @@ export class ChangePasswordComponent extends BaseChangePasswordComponent {
         );
         if (learnMore) {
           this.platformUtilsService.launchUri(
-            "https://bitwarden.com/help/attachments/#add-storage-space"
+            "https://help.bitwarden.com/article/attachments/#fixing-old-attachments"
           );
         }
         this.rotateEncKey = false;

src/app/settings/emergency-access-add-edit.component.html

@@ -51,7 +51,7 @@
             target="_blank"
             rel="noopener"
             appA11yTitle="{{ 'learnMore' | i18n }}"
-            href="https://bitwarden.com/help/emergency-access/#user-access"
+            href="https://bitwarden.com/help/article/emergency-access/#user-access"
           >
             <i class="bwi bwi-question-circle" aria-hidden="true"></i>
           </a>

src/app/settings/emergency-access-confirm.component.html

@@ -18,7 +18,11 @@
       <div class="modal-body">
         <p>
           {{ "fingerprintEnsureIntegrityVerify" | i18n }}
-          <a href="https://bitwarden.com/help/fingerprint-phrase/" target="_blank" rel="noopener">
+          <a
+            href="https://help.bitwarden.com/article/fingerprint-phrase/"
+            target="_blank"
+            rel="noopener"
+          >
             {{ "learnMore" | i18n }}</a
           >
         </p>

src/app/settings/emergency-access.component.html

@@ -3,7 +3,7 @@
 </div>
 <p>
   {{ "emergencyAccessDesc" | i18n }}
-  <a href="https://bitwarden.com/help/emergency-access/" target="_blank" rel="noopener">
+  <a href="https://bitwarden.com/help/article/emergency-access/" target="_blank" rel="noopener">
     {{ "learnMore" | i18n }}.
   </a>
 </p>

src/app/settings/options.component.html

@@ -52,7 +52,7 @@
           <label for="locale">{{ "language" | i18n }}</label>
           <a
             class="ml-auto"
-            href="https://bitwarden.com/help/localization/"
+            href="https://help.bitwarden.com/article/localization/"
             target="_blank"
             rel="noopener"
             appA11yTitle="{{ 'learnMore' | i18n }}"
@@ -80,7 +80,7 @@
         {{ "disableIcons" | i18n }}
       </label>
       <a
-        href="https://bitwarden.com/help/website-icons/"
+        href="https://help.bitwarden.com/article/website-icons/"
         target="_blank"
         rel="noopener"
         appA11yTitle="{{ 'learnMore' | i18n }}"

src/app/settings/options.component.ts

@@ -74,12 +74,8 @@ export class OptionsComponent implements OnInit {
     this.disableIcons = await this.stateService.getDisableFavicon();
     this.enableGravatars = await this.stateService.getEnableGravitars();
     this.enableFullWidth = await this.stateService.getEnableFullWidth();
-
-    this.locale = await this.stateService.getLocale();
-    this.startingLocale = this.locale;
-
-    this.theme = await this.stateService.getTheme();
-    this.startingTheme = this.theme;
+    this.locale = (await this.stateService.getLocale()) ?? this.startingLocale;
+    this.theme = (await this.stateService.getTheme()) ?? this.startingTheme;
   }
 
   async submit() {
@@ -108,7 +104,10 @@ export class OptionsComponent implements OnInit {
     if (this.locale !== this.startingLocale) {
       window.location.reload();
     } else {
-      this.platformUtilsService.showToast("success", null, this.i18nService.t("optionsUpdated"));
+      this.platformUtilsService.showToast("success", null, [
+        this.i18nService.t("optionsUpdated"),
+        this.i18nService.t("optionsUpdated"),
+      ]);
     }
   }
 

src/app/settings/profile.component.html

@@ -56,7 +56,7 @@
       <p *ngIf="fingerprint">
         {{ "yourAccountsFingerprint" | i18n }}:
         <a
-          href="https://bitwarden.com/help/fingerprint-phrase/"
+          href="https://help.bitwarden.com/article/fingerprint-phrase/"
           target="_blank"
           rel="noopener"
           appA11yTitle="{{ 'learnMore' | i18n }}"

src/app/settings/update-key.component.html

@@ -22,7 +22,7 @@
         <p>
           {{ "updateEncryptionKeyShortDesc" | i18n }} {{ "updateEncryptionKeyDesc" | i18n }}
           <a
-            href="https://bitwarden.com/help/account-encryption-key/#rotate-your-encryption-key"
+            href="https://help.bitwarden.com/article/update-encryption-key/"
             target="_blank"
             rel="noopener"
             >{{ "learnMore" | i18n }}</a

src/app/tools/import.component.html

@@ -29,14 +29,18 @@
   <app-callout type="info" title="{{ getFormatInstructionTitle() }}" *ngIf="format">
     <ng-container *ngIf="format === 'bitwardencsv' || format === 'bitwardenjson'">
       See detailed instructions on our help site at
-      <a target="_blank" rel="noopener" href="https://bitwarden.com/help/export-your-data/">
-        https://bitwarden.com/help/export-your-data/</a
+      <a target="_blank" rel="noopener" href="https://help.bitwarden.com/article/export-your-data/">
+        https://help.bitwarden.com/article/export-your-data/</a
       >
     </ng-container>
     <ng-container *ngIf="format === 'lastpasscsv'">
       See detailed instructions on our help site at
-      <a target="_blank" rel="noopener" href="https://bitwarden.com/help/import-from-lastpass/">
-        https://bitwarden.com/help/import-from-lastpass/</a
+      <a
+        target="_blank"
+        rel="noopener"
+        href="https://help.bitwarden.com/article/import-from-lastpass/"
+      >
+        https://help.bitwarden.com/article/import-from-lastpass/</a
       >
     </ng-container>
     <ng-container *ngIf="format === 'keepassxcsv'">
@@ -92,20 +96,32 @@
         The process is exactly the same as importing from Google Chrome.
       </span>
       See detailed instructions on our help site at
-      <a target="_blank" rel="noopener" href="https://bitwarden.com/help/import-from-chrome/">
-        https://bitwarden.com/help/import-from-chrome/</a
+      <a
+        target="_blank"
+        rel="noopener"
+        href="https://help.bitwarden.com/article/import-from-chrome/"
+      >
+        https://help.bitwarden.com/article/import-from-chrome/</a
       >
     </ng-container>
     <ng-container *ngIf="format === 'firefoxcsv'">
       See detailed instructions on our help site at
-      <a target="_blank" rel="noopener" href="https://bitwarden.com/help/import-from-firefox/">
-        https://bitwarden.com/help/import-from-firefox/</a
+      <a
+        target="_blank"
+        rel="noopener"
+        href="https://bitwarden.com/help/article/import-from-firefox/"
+      >
+        https://bitwarden.com/help/article/import-from-firefox/</a
       >.
     </ng-container>
     <ng-container *ngIf="format === 'safaricsv'">
       See detailed instructions on our help site at
-      <a target="_blank" rel="noopener" href="https://bitwarden.com/help/import-from-safari/">
-        https://bitwarden.com/help/import-from-safari/</a
+      <a
+        target="_blank"
+        rel="noopener"
+        href="https://bitwarden.com/help/article/import-from-safari/"
+      >
+        https://bitwarden.com/help/article/import-from-safari/</a
       >.
     </ng-container>
     <ng-container
@@ -114,8 +130,12 @@
       "
     >
       See detailed instructions on our help site at
-      <a target="_blank" rel="noopener" href="https://bitwarden.com/help/import-from-1password/">
-        https://bitwarden.com/help/import-from-1password/</a
+      <a
+        target="_blank"
+        rel="noopener"
+        href="https://help.bitwarden.com/article/import-from-1password/"
+      >
+        https://help.bitwarden.com/article/import-from-1password/</a
       >.
     </ng-container>
     <ng-container *ngIf="format === 'passworddragonxml'">

src/app/vault/add-edit-custom-fields.component.html

@@ -11,7 +11,7 @@
           <label for="fieldName{{ i }}">{{ "name" | i18n }}</label>
           <a
             class="ml-auto"
-            href="https://bitwarden.com/help/custom-fields/"
+            href="https://help.bitwarden.com/article/custom-fields/"
             target="_blank"
             rel="noopener"
             appA11yTitle="{{ 'learnMore' | i18n }}"

src/app/vault/add-edit.component.html

@@ -103,7 +103,7 @@
                     (click)="generatePassword()"
                     *ngIf="cipher.viewPassword"
                   >
-                    <i class="bwi bwi-lg bwi-fw bwi-generate" aria-hidden="true"></i>
+                    <i class="bwi bwi-lg bwi-fw bwi-refresh" aria-hidden="true"></i>
                   </a>
                   <a
                     href="#"
@@ -268,7 +268,7 @@
                       (click)="launch(u)"
                       [disabled]="!u.canLaunch"
                     >
-                      <i class="bwi bwi-lg bwi-share-square" aria-hidden="true"></i>
+                      <i class="bwi bwi-lg bwi-share" aria-hidden="true"></i>
                     </button>
                     <button
                       type="button"
@@ -288,7 +288,7 @@
                   </label>
                   <a
                     class="ml-auto"
-                    href="https://bitwarden.com/help/uri-match-detection/"
+                    href="https://help.bitwarden.com/article/uri-match-detection/"
                     target="_blank"
                     rel="noopener"
                     appA11yTitle="{{ 'learnMore' | i18n }}"
@@ -793,7 +793,7 @@
               target="_blank"
               rel="noopener"
               appA11yTitle="{{ 'learnMore' | i18n }}"
-              href="https://bitwarden.com/help/managing-items/#protect-individual-items"
+              href="https://bitwarden.com/help/article/managing-items/#protect-individual-items"
             >
               <i class="bwi bwi-question-circle" aria-hidden="true"></i>
             </a>

src/app/vault/attachments.component.html

@@ -38,7 +38,7 @@
                   <a href="#" appStopClick (click)="download(a)">{{ a.fileName }}</a>
                   <div *ngIf="showFixOldAttachments(a)" class="ml-2">
                     <a
-                      href="https://bitwarden.com/help/attachments/#fixing-old-attachments"
+                      href="https://help.bitwarden.com/article/attachments/#fixing-old-attachments"
                       target="_blank"
                       rel="noopener"
                     >

src/app/vault/bulk-actions.component.html

@@ -17,7 +17,7 @@
       (click)="bulkMove()"
       *ngIf="!deleted && !organization"
     >
-      <i class="bwi bwi-fw bwi-folder" aria-hidden="true"></i>
+      <i class="bwi bwi-fw bwi-share" aria-hidden="true"></i>
       {{ "moveSelected" | i18n }}
     </button>
     <button

src/app/vault/groupings.component.html

@@ -3,7 +3,7 @@
     {{ "filters" | i18n }}
     <a
       class="ml-auto"
-      href="https://bitwarden.com/help/searching-vault/"
+      href="https://help.bitwarden.com/article/searching-vault/"
       target="_blank"
       rel="noopener"
       appA11yTitle="{{ 'learnMore' | i18n }}"
@@ -30,7 +30,7 @@
       </li>
       <li [ngClass]="{ active: selectedFavorites }" *ngIf="showFavorites">
         <a href="#" appStopClick (click)="selectFavorites()">
-          <i class="bwi bwi-li bwi-fw bwi-star"></i>{{ "favorites" | i18n }}
+          <i class="bwi bwi-li bwi-fw bwi-star-f"></i>{{ "favorites" | i18n }}
         </a>
       </li>
       <li [ngClass]="{ active: selectedTrash }" *ngIf="showTrash">
@@ -92,8 +92,8 @@
                   class="bwi-li bwi"
                   title="{{ 'toggleCollapse' | i18n }}"
                   [ngClass]="{
-                    'bwi-angle-right': isCollapsed(f.node),
-                    'bwi-angle-down': !isCollapsed(f.node)
+                    'bwi-caret-right': isCollapsed(f.node),
+                    'bwi-caret-down': !isCollapsed(f.node)
                   }"
                   (click)="collapse(f.node)"
                 ></i>
@@ -141,8 +141,8 @@
                 class="bwi-li bwi"
                 title="{{ 'toggleCollapse' | i18n }}"
                 [ngClass]="{
-                  'bwi-angle-right': isCollapsed(c.node),
-                  'bwi-angle-down': !isCollapsed(c.node)
+                  'bwi-caret-right': isCollapsed(c.node),
+                  'bwi-caret-down': !isCollapsed(c.node)
                 }"
                 (click)="collapse(c.node)"
               ></i>

src/app/vault/vault.component.html

@@ -102,7 +102,7 @@
           {{ "organizations" | i18n }}
           <a
             class="ml-auto"
-            href="https://bitwarden.com/help/about-organizations/"
+            href="https://help.bitwarden.com/article/what-is-an-organization/"
             target="_blank"
             rel="noopener"
             appA11yTitle="{{ 'learnMore' | i18n }}"
@@ -119,7 +119,7 @@
           {{ "providers" | i18n }}
           <a
             class="ml-auto"
-            href="https://bitwarden.com/help/providers/"
+            href="https://bitwarden.com/help/article/about-providers/"
             target="_blank"
             rel="noopener"
             appA11yTitle="{{ 'learnMore' | i18n }}"

src/connectors/captcha-mobile.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="theme_light">
+<html>
   <head>
     <meta charset="utf-8" />
     <meta

src/connectors/captcha.ts

@@ -47,7 +47,7 @@ async function start() {
 
   let decodedData: any;
   try {
-    decodedData = JSON.parse(b64Decode(data, true));
+    decodedData = JSON.parse(b64Decode(data));
   } catch (e) {
     error("Cannot parse data.");
     return;

src/connectors/common.ts

@@ -14,11 +14,7 @@ export function getQsParam(name: string) {
   return decodeURIComponent(results[2].replace(/\+/g, " "));
 }
 
-export function b64Decode(str: string, spaceAsPlus = false) {
-  if (spaceAsPlus) {
-    str = str.replace(/ /g, "+");
-  }
-
+export function b64Decode(str: string) {
   return decodeURIComponent(
     Array.prototype.map
       .call(atob(str), (c: string) => {

src/connectors/webauthn-fallback.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="theme_light">
+<html>
   <head>
     <meta charset="utf-8" />
     <title>Bitwarden WebAuthn Connector</title>

src/images/register-layout/cnet-logo.svg

@@ -1,3 +0,0 @@
-<svg width="1236" height="906" viewBox="0 0 1236 906" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1188.71 632.229C1204.72 632.229 1236 632.229 1236 632.229V689.173C1236 689.173 1174.89 689.173 1162.52 689.173C1138.52 689.173 1115.24 677.492 1121.79 680.413C1087.59 665.081 1074.5 627.849 1071.59 586.235V109.508H1148.7V228.508V229.238H1222.18V284.722H1148.7V285.452V592.076C1150.16 622.738 1168.34 632.229 1188.71 632.229ZM757.319 588.425V327.065C755.137 179.594 1014.12 178.864 1009.75 330.716V456.285C1009.75 464.316 1003.21 470.156 995.932 470.156H834.432V592.076C835.159 649.75 934.096 649.02 934.096 592.076V533.671H1010.48V588.425C1014.12 739.547 755.137 735.897 757.319 588.425ZM932.641 412.482V327.065C932.641 270.121 834.432 270.121 832.977 327.065V412.482H932.641ZM608.186 319.765C608.186 266.471 517.979 267.931 516.524 321.955V689.173H405.219V632.229H440.866V286.182H398.672V229.968H506.339V271.581C506.339 271.581 519.433 251.869 553.625 232.888C597.274 208.796 640.195 232.888 633.648 229.968C667.839 245.299 680.934 282.532 683.844 324.145V632.959H732.585V689.173H608.913L608.186 319.765ZM303.372 0H358.661V906H303.372V0ZM0.0137167 588.425V327.065C-2.16872 179.594 256.814 178.864 252.449 330.716V375.979H176.791L176.064 327.065C176.064 270.851 78.5814 272.311 76.399 329.255V592.076C77.1265 649.75 176.064 649.02 176.064 592.076V533.671H252.449V588.425C256.814 739.547 -2.16872 735.897 0.0137167 588.425Z" fill="black"/>
-</svg>

src/images/register-layout/forbes-logo.svg

@@ -1,4 +0,0 @@
-<svg width="1955" height="490" viewBox="0 0 1955 490" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1190.36 139.23C1158.92 139.23 1134.23 145.974 1109.52 159.436C1109.52 87.5714 1109.52 22.4505 1111.78 0L961.288 26.9381V40.4136L977.007 42.6573C997.201 47.1449 1003.97 58.3636 1008.42 85.3276C1012.95 139.23 1010.68 426.703 1008.42 473.874C1048.85 482.862 1091.53 489.606 1134.21 489.606C1253.25 489.606 1325.11 415.484 1325.11 298.692C1325.11 206.62 1266.72 139.23 1190.36 139.23V139.23ZM1138.7 464.886C1129.71 464.886 1118.47 464.886 1111.75 462.655C1109.49 431.217 1107.26 298.692 1109.49 181.913C1122.97 177.412 1131.94 175.169 1143.19 175.169C1192.63 175.169 1219.58 233.558 1219.58 305.41C1219.57 395.277 1185.87 464.886 1138.7 464.886V464.886ZM395.29 8.97504H0V29.1818L22.4635 31.4256C51.6453 35.9131 62.8901 53.8761 67.3646 96.5464C74.1218 177.4 71.8651 323.399 67.3646 392.995C62.8771 435.678 51.6583 455.898 22.4635 458.116L0 462.629V480.592H253.791V462.629L226.84 458.116C197.645 455.885 186.413 435.678 181.926 392.995C179.669 363.787 177.425 316.616 177.425 258.24L231.328 260.483C265.023 260.483 280.729 287.434 287.473 325.604H307.693V166.194H287.473C280.716 204.377 265.023 231.315 231.328 231.315L177.438 233.571C177.438 157.206 179.682 85.3406 181.939 42.6703H260.535C321.195 42.6703 352.633 80.8401 375.084 148.231L397.547 141.486L395.29 8.97504V8.97504Z" fill="black"/>
-<path d="M523.315 134.742C635.619 134.742 691.765 211.108 691.765 312.168C691.765 408.74 628.875 489.619 516.57 489.619C404.279 489.619 348.133 413.241 348.133 312.168C348.133 215.596 411.01 134.742 523.315 134.742V134.742ZM516.57 157.206C467.156 157.206 453.68 224.584 453.68 312.168C453.68 397.508 476.144 467.13 521.071 467.13C572.69 467.13 586.192 399.752 586.192 312.168C586.192 226.827 563.754 157.206 516.57 157.206ZM1354.3 314.425C1354.3 222.34 1412.69 134.742 1527.23 134.742C1621.54 134.742 1666.48 204.377 1666.48 296.449H1457.6C1455.34 379.545 1495.77 440.192 1576.64 440.192C1612.57 440.192 1630.54 431.23 1653.01 415.497L1661.98 426.716C1639.51 458.155 1590.11 489.619 1527.23 489.619C1426.16 489.606 1354.3 417.741 1354.3 314.425V314.425ZM1457.6 271.754L1563.16 269.498C1563.16 224.584 1556.42 157.206 1518.25 157.206C1480.08 157.206 1459.83 220.083 1457.6 271.754V271.754ZM1933.78 152.718C1906.83 141.474 1870.91 134.742 1830.48 134.742C1747.39 134.742 1695.71 184.144 1695.71 242.547C1695.71 300.949 1733.85 325.643 1787.82 343.619C1843.95 363.813 1859.69 379.545 1859.69 406.496C1859.69 433.448 1839.47 458.142 1803.53 458.142C1760.87 458.142 1729.41 433.448 1704.71 366.057L1688.98 370.57L1691.24 469.387C1718.19 480.605 1767.59 489.606 1810.27 489.606C1897.87 489.606 1954.03 444.666 1954.03 375.058C1954.03 327.887 1929.31 300.949 1870.92 278.473C1808.01 253.778 1785.58 238.059 1785.58 208.851C1785.58 179.656 1805.82 159.437 1832.77 159.437C1873.17 159.437 1900.13 184.144 1920.37 244.79L1936.08 240.303L1933.78 152.718V152.718ZM983.726 143.73C945.556 121.293 878.166 132.499 842.239 213.365L844.47 134.755L694.009 163.95V177.426L709.728 179.669C729.961 181.926 738.923 193.145 741.18 222.353C745.667 276.255 743.423 370.596 741.18 417.754C738.923 444.679 729.961 458.155 709.728 460.412L694.009 462.668V480.631H902.873V462.668L875.922 460.412C853.471 458.155 846.727 444.679 844.47 417.754C839.983 375.071 839.983 289.73 842.239 235.828C853.458 220.096 902.873 206.633 947.787 235.828L983.726 143.73V143.73Z" fill="black"/>
-</svg>

src/images/register-layout/logo-horizontal-white.svg

@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 547 83"><defs><style>.cls-1{fill:#fff;fill-rule:evenodd;}</style></defs><path class="cls-1" d="M129,20.6c6.3,0,11.2,2.4,14.8,7.4s5.4,11.6,5.4,20.1c0,8.8-1.8,15.6-5.5,20.4s-8.7,7.2-15,7.2-11.1-2.2-14.7-6.8h-1l-1.9,4.7a1.85,1.85,0,0,1-1.7,1.1h-8a1.79,1.79,0,0,1-1.8-1.8V2.6A1.79,1.79,0,0,1,101.4.8h10.8A1.79,1.79,0,0,1,114,2.6V18q0,3.3-.6,10.5h.6C117.3,23.3,122.4,20.6,129,20.6Zm-4.6,11.7c-3.5,0-6.2,1.1-7.9,3.3S114,41.5,114,46.5v1.6c0,5.7.8,9.8,2.5,12.2s4.4,3.7,8.1,3.7a8.07,8.07,0,0,0,7.1-4.2c1.7-2.7,2.6-6.8,2.6-11.9s-.9-9.1-2.6-11.7A8.52,8.52,0,0,0,124.4,32.3ZM173,74.8H162.2a1.79,1.79,0,0,1-1.8-1.8V23.5a1.79,1.79,0,0,1,1.8-1.8H173a1.79,1.79,0,0,1,1.8,1.8V72.9A1.88,1.88,0,0,1,173,74.8Zm39.5-10.7a30.19,30.19,0,0,0,7.6-1.2,1.2,1.2,0,0,1,1.5,1.2v8.3a1.23,1.23,0,0,1-.7,1.1,33.36,33.36,0,0,1-12.5,2.1c-5.8,0-10-1.4-12.6-4.4s-4-7.3-4-13.1V32.6h-5.7a1.16,1.16,0,0,1-1.2-1.2V26.7c0-.1.1-.2.1-.3l7.9-4.7,3.9-10.4a1.17,1.17,0,0,1,1.1-.8h7.2a1.16,1.16,0,0,1,1.2,1.2V21.8h14.3a.65.65,0,0,1,.6.6v9a1.16,1.16,0,0,1-1.2,1.2H206.4V58a5.66,5.66,0,0,0,1.7,4.5A5.82,5.82,0,0,0,212.5,64.1Zm67.3,10.7a3.45,3.45,0,0,1-3.1-2.2L266.1,40.3c-.7-2.3-1.6-5.8-2.8-10.3H263l-1,3.6-2.1,6.8L249,72.7a3,3,0,0,1-3,2.1,3.09,3.09,0,0,1-3-2.3L229.7,26a2.33,2.33,0,0,1,2.3-2.9h.3a2.34,2.34,0,0,1,2.2,1.7l7.8,28.3c1.9,7.4,3.2,12.8,3.8,16.4h.3c1.8-7.4,3.2-12.3,4.1-14.8l10.1-29.6a3,3,0,0,1,2.9-2,2.91,2.91,0,0,1,2.8,2l9.4,29.4c2.3,7.5,3.7,12.3,4.2,14.8h.3c.3-2,1.5-7.6,3.8-16.6l7.5-27.9a2.34,2.34,0,0,1,2.2-1.7,2.28,2.28,0,0,1,2.2,2.9L283.3,72.5a3.12,3.12,0,0,1-3.1,2.3Zm59.4,0a1.83,1.83,0,0,1-1.8-1.6l-.9-6.6H336a24.69,24.69,0,0,1-8,7.1,21,21,0,0,1-9.7,2c-5.1,0-9-1.3-11.8-3.9a13,13,0,0,1-4.1-9.3,14.43,14.43,0,0,1,6-13.1c4.3-2.8,10.3-4.5,18.4-4.5l9.8-.3V41.2c0-5-1-8.6-3.1-11.1s-5.2-3.7-9.6-3.7a29.33,29.33,0,0,0-12.8,3.1,2.2,2.2,0,0,1-2.9-1.1,2.06,2.06,0,0,1,1.1-2.8,39.78,39.78,0,0,1,14.9-3.1c5.7,0,9.9,1.5,12.8,4.5s4.2,7.6,4.2,13.7V73.2A2.3,2.3,0,0,1,339.2,74.8Zm-20.7-3.4c5.6,0,9.9-1.6,13-4.7s4.8-7.6,4.8-13.1v-5l-9,.4c-7.3.3-12.4,1.5-15.6,3.4s-4.7,5-4.7,9a10.09,10.09,0,0,0,2.9,7.6A14.85,14.85,0,0,0,318.5,71.4Zm59.2-49.3a39.56,39.56,0,0,1,4.7.3,2.26,2.26,0,0,1,1.9,2.6,2.19,2.19,0,0,1-2.6,1.7,34.19,34.19,0,0,0-4.5-.4,13,13,0,0,0-10.8,5.6c-2.8,3.7-4.2,8.5-4.2,14.1V72.2a2.3,2.3,0,0,1-4.6,0v-47a2,2,0,0,1,2-2,1.92,1.92,0,0,1,2,1.9l.4,7.4h.3c2.1-3.8,4.4-6.5,6.8-8A14.77,14.77,0,0,1,377.7,22.1Zm35.2,0a22.38,22.38,0,0,1,9.7,2,18,18,0,0,1,7.3,7h.3c-.2-4.1-.3-7.9-.3-11.7V3.1a2.3,2.3,0,0,1,4.6,0V73a1.58,1.58,0,0,1-1.6,1.6,1.62,1.62,0,0,1-1.6-1.5l-1-6.5h-.4c-3.9,5.9-9.6,8.8-16.9,8.8s-12.5-2.2-16.4-6.7c-3.7-4.5-5.7-10.9-5.7-19.4,0-8.9,1.8-15.7,5.6-20.5C400.3,24.5,405.7,22.1,412.9,22.1Zm0,4.3c-5.7,0-9.9,2-12.8,6s-4.2,9.6-4.2,17.2q0,21.9,17.1,21.9c5.9,0,10.1-1.7,12.8-5.1s4.1-9,4.1-16.8v-.8c0-8-1.3-13.7-4.1-17.1C423.2,28.1,418.9,26.4,412.9,26.4Zm59.9,49.3c-7.5,0-13.3-2.3-17.6-7s-6.3-11.1-6.3-19.4,2-14.9,6.1-19.8,9.5-7.5,16.4-7.5c6,0,10.9,2.1,14.3,6.3,3.6,4.2,5.3,10,5.3,17.3v3.8H453.8c.1,7.1,1.7,12.5,5,16.3s7.9,5.5,14,5.5a45,45,0,0,0,7.8-.6,40.43,40.43,0,0,0,5.8-1.6,2,2,0,0,1,2.7,1.9,2.05,2.05,0,0,1-1.3,1.9,34.12,34.12,0,0,1-6.8,2A30.33,30.33,0,0,1,472.8,75.7Zm-1.4-49.4c-5,0-9,1.6-12,4.9s-4.7,8-5.3,14.1h32c0-5.9-1.3-10.7-3.9-14A13,13,0,0,0,471.4,26.3Zm72.4,48.5a2.26,2.26,0,0,1-2.3-2.3V41.2c0-5.2-1.1-9-3.2-11.3-2.3-2.3-5.6-3.6-10.2-3.6-6.2,0-10.7,1.5-13.5,4.7s-4.4,8.2-4.4,15.1V72.3a2.3,2.3,0,0,1-4.6,0V25.2a2.05,2.05,0,0,1,2.1-2.1,2.15,2.15,0,0,1,2.1,1.8l.6,5.2h.3c3.4-5.4,9.3-8.1,17.9-8.1,11.7,0,17.6,6.3,17.6,18.9V72.3A2.6,2.6,0,0,1,543.8,74.8ZM167.7,0a8.29,8.29,0,0,0-8.5,8.1v.8a8.51,8.51,0,0,0,17,0V8.2A8.37,8.37,0,0,0,167.7,0ZM67.4,1.8A3.25,3.25,0,0,0,65,.8H3.4A3.1,3.1,0,0,0,1,1.8,3.41,3.41,0,0,0,0,4.2v41a24.58,24.58,0,0,0,1.8,9.1,32.33,32.33,0,0,0,4.4,8,44.2,44.2,0,0,0,6.3,6.8,58.68,58.68,0,0,0,6.8,5.5c2,1.4,4.3,2.8,6.5,4.1s3.8,2.2,4.7,2.6,1.7.8,2.2,1.1a3.42,3.42,0,0,0,2.8,0,21.66,21.66,0,0,0,2.3-1.1c.9-.5,2.5-1.3,4.7-2.6S46.9,76,49,74.6a68.56,68.56,0,0,0,6.8-5.5,49.81,49.81,0,0,0,6.3-6.8,36,36,0,0,0,4.4-8,24.58,24.58,0,0,0,1.8-9.1V4.2A2.93,2.93,0,0,0,67.4,1.8ZM59.5,45.6c0,14.9-25.3,27.7-25.3,27.7V9.6H59.5Z"/></svg>

src/locales/af/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "Vault Timeout"
   },

src/locales/az/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Ana parolunuz təzəlikcə təşkilatınızdakı bir administrator tərəfindən dəyişdirildi. Anbara müraciət üçün Ana parolunuzu indi yeniləməlisiniz. Davam etsəniz, hazırkı seansdan çıxış etmiş və təkrar giriş etməli olacaqsınız. Digər cihazlardakı aktiv seanslar bir saata qədər aktiv qalmağa davam edə bilər."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "Anbara müraciət bitəcək"
   },
@@ -4711,13 +4708,13 @@
     "message": "Açar Bağlayıcıya daşındı"
   },
   "paymentSponsored": {
-    "message": "Zəhmət olmasa təşkilatla əlaqələndirmək üçün bir ödəniş metodu təqdim edin. Narahat olmayın, əlavə özəllikləri seçmədiyiniz və ya sponsorluğunuz bitmədiyi müddətcə sizdən heç bir ödəniş tutulmayacaq. "
+    "message": "Please provide a payment method to associate with the organization. Don't worry, we won't charge you anything unless you select additional features or your sponsorship expires. "
   },
   "orgCreatedSponsorshipInvalid": {
-    "message": "Sponsorluq təklifinin müddəti bitdi. 7 günlük sınaq müddətinin sonunda ödəniş tutulmaması üçün yaratdığınız təşkilatı silə bilərsiniz. Əks halda, təşkilatı olduğu kimi saxlamaq və faktura məsuliyyətini öz üzərinizə götürmək üçün bu istəyi bağlaya bilərsiniz."
+    "message": "The sponsorship offer has expired. You may delete the organization you created to avoid a charge at the end of your 7 day trial. Otherwise you may close this prompt to keep the organization and assume billing responsibility."
   },
   "newFamiliesOrganization": {
-    "message": "Yeni Ailə Təşkilatı"
+    "message": "New Families Organization"
   },
   "acceptOffer": {
     "message": "Təklifi qəbul et"

src/locales/be/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "Vault Timeout"
   },

src/locales/bg/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Вашата главна парола наскоро е била сменена от администратор в организацията Ви. За да получите достъп до трезора, трябва да промените главната си парола сега. Това означава, че ще бъдете отписан(а) от текущата си сесия и ще трябва да се впишете отново. Активните сесии на други устройства може да продължат да бъдат активни още един час."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Вашата главна парола не отговарян на изискванията в политиката на тази организацията. За да се присъедините към организацията, трябва да промените главната си парола сега. Това означава, че ще бъдете отписан(а) от текущата си сесия и ще трябва да се впишете отново. Активните сесии на други устройства може да продължат да бъдат активни още един час."
-  },
   "maximumVaultTimeout": {
     "message": "Време за достъп"
   },

src/locales/bn/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "Vault Timeout"
   },

src/locales/ca/messages.json

@@ -1106,7 +1106,7 @@
     "message": "Canvia l'idioma utilitzat per la caixa forta web."
   },
   "disableIcons": {
-    "message": "Inhabilita les icones del lloc web"
+    "message": "Deshabilita les icones del lloc web"
   },
   "disableIconsDesc": {
     "message": "Les icones del lloc web proporcionen una imatge que es pot reconèixer al costat de cada element d'inici de sessió a la vostra caixa forta."
@@ -1215,7 +1215,7 @@
     "message": "Administra"
   },
   "disable": {
-    "message": "Inhabilita"
+    "message": "Deshabilita"
   },
   "twoStepLoginProviderEnabled": {
     "message": "Aquest proveïdor d'inici de sessió en dues passes està habilitat al vostre compte."
@@ -1260,7 +1260,7 @@
     "message": "Esteu segur que voleu inhabilitar aquest proveïdor d'inici de sessió en dues passes?"
   },
   "twoStepDisabled": {
-    "message": "El proveïdor d'inici de sessió en dues passes està inhabilitat."
+    "message": "El proveïdor d'inici de sessió en dues passes està deshabilitat."
   },
   "twoFactorYubikeyAdd": {
     "message": "Afegiu una nova YubiKey al vostre compte"
@@ -1326,7 +1326,7 @@
     "message": "S'han actualitzat les YubiKeys"
   },
   "disableAllKeys": {
-    "message": "Inhabilita totes les claus"
+    "message": "Deshabilita totes les claus"
   },
   "twoFactorDuoDesc": {
     "message": "Introduïu la informació de l'aplicació Bitwarden des del vostre tauler d'Administrador de Duo."
@@ -2321,7 +2321,7 @@
     "message": "Inici de sessió en dues passes habilitat/actualitzat."
   },
   "disabled2fa": {
-    "message": "S'ha inhabilitat l'inici de sessió en dues passes."
+    "message": "S'ha deshabilitat l'inici de sessió en dues passes."
   },
   "recovered2fa": {
     "message": "S'ha recuperat el compte des de l'inici de sessió en dues passes."
@@ -3551,7 +3551,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "disabled": {
-    "message": "Inhabilitat"
+    "message": "Deshabilitat"
   },
   "sendLink": {
     "message": "Enllaç Send",
@@ -4287,7 +4287,7 @@
     }
   },
   "providerIsDisabled": {
-    "message": "S'ha inhabilitat el proveïdor."
+    "message": "S'ha deshabilitat el proveïdor."
   },
   "providerUpdated": {
     "message": "S'ha actualitzat el proveïdor"
@@ -4314,7 +4314,7 @@
     "message": "Esteu segur que voleu separar aquesta organització? L'organització continuarà existint, però ja no serà gestionada pel proveïdor."
   },
   "add": {
-    "message": "Afig"
+    "message": "Afegeix"
   },
   "updatedMasterPassword": {
     "message": "Contrasenya mestra actualitzada"
@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Un administrador de l'organització ha canviat recentment la contrasenya principal. Per accedir a la caixa forta, heu d'actualitzar-la ara. Si continueu, es tancarà la sessió actual i heu de tornar a iniciar-la. És possible que les sessions obertes en altres dispositius continuen actives fins a una hora."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "Temps d'espera de la caixa forta"
   },
@@ -4372,7 +4369,7 @@
     "message": "Prohibeix als usuaris exportar les dades de la seua caixa forta privada."
   },
   "vaultExportDisabled": {
-    "message": "L'exportació de la caixa forta està inhabilitada"
+    "message": "L'exportació de la caixa forta està deshabilitada"
   },
   "personalVaultExportPolicyInEffect": {
     "message": "Una o més polítiques d'organització us impedeixen exportar la vostra caixa forta."
@@ -4459,7 +4456,7 @@
     "message": "Voleu les afirmacions signades"
   },
   "spValidateCertificates": {
-    "message": "Valida certificats"
+    "message": "Validar certificats"
   },
   "idpEntityId": {
     "message": "Identificador de l'entitat"
@@ -4486,7 +4483,7 @@
     "message": "Permet la resposta d'autenticació no sol·licitada"
   },
   "idpDisableOutboundLogoutRequests": {
-    "message": "Inhabilita les sol·licituds de tancament de sessió d'eixida"
+    "message": "Desactiva les sol·licituds de tancament de sessió d'eixida"
   },
   "idpWantAuthnRequestsSigned": {
     "message": "Voleu que les sol·licituds d'autenticació estiguen signades"
@@ -4495,22 +4492,22 @@
     "message": "S'ha guardat la configuració de l'inici de sessió únic."
   },
   "sponsoredFamilies": {
-    "message": "Famílies Bitwarden gratuït"
+    "message": "Familias de Bitwarden gratis"
   },
   "sponsoredFamiliesEligible": {
-    "message": "Tu i la teua família sou elegibles per a famílies Bitwarden gratuït. Bescanvia amb el correu electrònic personal per mantenir les dades segures fins i tot quan no esteu a la feina."
+    "message": "Tú y tu familia sois elegibles para Familias Bitwarden gratis. Canjealo con tu correo electrónico personal para mantener tus datos seguros incluso cuando no estés en el trabajo."
   },
   "sponsoredFamiliesEligibleCard": {
-    "message": "Bescanvia el teu pla gratuït de Bitwarden per a famílies hui mateix per mantenir les teues dades segures fins i tot quan no estigues a la feina."
+    "message": "Canjea tu plan gratuito de Bitwarden para familias hoy mismo para mantener tus datos seguros incluso cuando no estés en el trabajo."
   },
   "sponsoredFamiliesInclude": {
-    "message": "El pla Bitwarden per a Families inclou"
+    "message": "El plan Bitwarden paraFamilias incluye"
   },
   "sponsoredFamiliesPremiumAccess": {
-    "message": "Accés premium fins a 6 usuaris"
+    "message": "Acceso Premium para un máximo de 6 usuarios"
   },
   "sponsoredFamiliesSharedCollections": {
-    "message": "Col·leccions compartides de Secrets familiars"
+    "message": "Colecciones compartidas para los secretos de familia"
   },
   "badToken": {
     "message": "The link is no longer valid. Please have the sponsor resend the offer."
@@ -4552,19 +4549,19 @@
     }
   },
   "sponsoredFamiliesOffer": {
-    "message": "Accepta Famílies Bitwarden gratuït"
+    "message": "Acepta Bitwarden Familias gratuito"
   },
   "sponsoredFamiliesOfferRedeemed": {
-    "message": "L'oferta gratuïta de Bitwarden Famílies s'ha bescanviat correctament"
+    "message": "Oferta gratuita de Bitwarden Familias canjeada con éxito"
   },
   "redeemed": {
-    "message": "Bescanviat"
+    "message": "Canjeado"
   },
   "redeemedAccount": {
-    "message": "Compte bescanviat"
+    "message": "Cuenta canjeada"
   },
   "revokeAccount": {
-    "message": "Revoca el compte $NAME$",
+    "message": "Revocar la cuenta $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -4582,13 +4579,13 @@
     }
   },
   "freeFamiliesPlan": {
-    "message": "Pla Famílies Gratuït"
+    "message": "Plan Familias Gratuito"
   },
   "redeemNow": {
-    "message": "Bescanvia ara"
+    "message": "Redeem Now"
   },
   "recipient": {
-    "message": "Destinatari"
+    "message": "Recipient"
   },
   "removeSponsorship": {
     "message": "Remove Sponsorship"
@@ -4612,13 +4609,13 @@
     "message": "Sponsorship Removed"
   },
   "ssoKeyConnectorUnavailable": {
-    "message": "No es pot arribar al connector de claus, torneu-ho a provar més tard."
+    "message": "Unable to reach the Key Connector, try again later."
   },
   "keyConnectorUrl": {
     "message": "Key Connector URL"
   },
   "sendVerificationCode": {
-    "message": "Envia un codi de verificació al correu electrònic"
+    "message": "Send a verification code to your email"
   },
   "sendCode": {
     "message": "Envia codi"
@@ -4696,7 +4693,7 @@
     "message": "SSO habilitat"
   },
   "disabledSso": {
-    "message": "SSO inhabilitat"
+    "message": "SSO deshabilitat"
   },
   "enabledKeyConnector": {
     "message": "Enabled Key Connector"
@@ -4717,7 +4714,7 @@
     "message": "The sponsorship offer has expired. You may delete the organization you created to avoid a charge at the end of your 7 day trial. Otherwise you may close this prompt to keep the organization and assume billing responsibility."
   },
   "newFamiliesOrganization": {
-    "message": "Nova organització de famílies"
+    "message": "New Families Organization"
   },
   "acceptOffer": {
     "message": "Accept Offer"
@@ -4738,6 +4735,6 @@
     "message": "The sponsorship offer has expired."
   },
   "freeWithSponsorship": {
-    "message": "GRATUÏT amb patrocini"
+    "message": "GRATIS con patrocinio"
   }
 }

src/locales/cs/messages.json

@@ -4256,10 +4256,10 @@
     "message": "Create a new client organization that will be associated with you as the provider. You will be able to access and manage this organization."
   },
   "addExistingOrganization": {
-    "message": "Přidat existující organizaci"
+    "message": "Add Existing Organization"
   },
   "myProvider": {
-    "message": "Můj poskytovatel"
+    "message": "My Provider"
   },
   "addOrganizationConfirmation": {
     "message": "Are you sure you want to add $ORGANIZATION$ as a client to $PROVIDER$?",
@@ -4314,20 +4314,17 @@
     "message": "Are you sure you want to detach this organization? The organization will continue to exist but will no longer be managed by the provider."
   },
   "add": {
-    "message": "Přidat"
+    "message": "Add"
   },
   "updatedMasterPassword": {
-    "message": "Hlavní heslo aktualizováno"
+    "message": "Updated Master Password"
   },
   "updateMasterPassword": {
-    "message": "Aktualizovat hlavní heslo"
+    "message": "Update Master Password"
   },
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "Vault Timeout"
   },
@@ -4341,10 +4338,10 @@
     "message": "Invalid Maximum Vault Timeout."
   },
   "hours": {
-    "message": "Hodin"
+    "message": "Hours"
   },
   "minutes": {
-    "message": "Minut"
+    "message": "Minutes"
   },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
@@ -4381,7 +4378,7 @@
     "message": "Select SSO Type"
   },
   "type": {
-    "message": "Typ"
+    "message": "Type"
   },
   "openIdConnectConfig": {
     "message": "OpenID Connect Configuration"

src/locales/da/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Dit hovedadgangskode blev for nylig ændret af en administrator i din organisation. For at få adgang til boksen skal du opdatere din hovedadgangskode nu. Hvis du fortsætter, logges du ud af din nuværende session, hvilket kræver, at du logger ind igen. Aktive sessioner på andre enheder kan fortsætte med at være aktive i op til én time."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Din Hovedadgangskode opfylder ikke organisationens sikkerhedspolitikker. For at kunne blive organisationsmedlem, skal hovedadgangskoden derfor først opdateres. Fortsætter du, logges du ud af den aktuelle session, hvilket vil kræver genindlogning. Aktive sessioner på andre enheder kan forblive aktive i op til én time."
-  },
   "maximumVaultTimeout": {
     "message": "Boks-timeout"
   },

src/locales/de/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Dein Master-Passwort wurde kürzlich von einem Administrator deiner Organisation geändert. Um auf den Tresor zuzugreifen, musst du dein Master-Passwort jetzt aktualisieren. Wenn Du fortfährst, wirst du aus der aktuellen Sitzung abgemeldet und eine erneute Anmeldung ist erforderlich. Aktive Sitzungen auf anderen Geräten können bis zu einer Stunde weiterhin aktiv bleiben."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Ihr Master-Passwort erfüllt nicht die Anforderungen dieser Organisation. Um der Organisation beizutreten, müssen Sie Ihr Master-Passwort jetzt aktualisieren. Ein Fortfahren wird Ihre aktuelle Sitzung abmelden. Danach müssen Sie sich wieder anmelden. Aktive Sitzungen auf anderen Geräten können bis zu einer Stunde weiterhin aktiv bleiben."
-  },
   "maximumVaultTimeout": {
     "message": "Tresor-Timeout"
   },

src/locales/el/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Ο Κύριος Κωδικός Πρόσβασης σας άλλαξε πρόσφατα από διαχειριστή στον οργανισμό σας. Για να αποκτήσετε πρόσβαση στο vault, πρέπει να ενημερώσετε το κύριο κωδικό τώρα. Η διαδικασία θα σας αποσυνδέσει από την τρέχουσα συνεδρία σας, απαιτώντας από εσάς να συνδεθείτε ξανά. Οι ενεργές συνεδρίες σε άλλες συσκευές ενδέχεται να συνεχίσουν να είναι ενεργές για μία ώρα."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "Χρόνος Λήξης Vault"
   },

src/locales/en/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "Vault Timeout"  
   },

src/locales/en_GB/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organisation. In order to access the vault, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "masterPasswordInvalidWarning": {
-    "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"
   },

src/locales/en_IN/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "Vault Timeout"
   },

src/locales/eo/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "Vault Timeout"
   },

src/locales/es/messages.json

@@ -2660,7 +2660,7 @@
     "message": "Reenviar invitación"
   },
   "resendEmail": {
-    "message": "Reenviar correo"
+    "message": "Resend Email"
   },
   "hasBeenReinvited": {
     "message": "El usuario $USER$ ha sido reinvitado.",
@@ -4290,7 +4290,7 @@
     "message": "El servicio está desactivado."
   },
   "providerUpdated": {
-    "message": "Proveedor actualizado"
+    "message": "Provider updated"
   },
   "yourProviderIs": {
     "message": "Your provider is $PROVIDER$. They have administrative and billing privileges for your organization.",
@@ -4314,20 +4314,17 @@
     "message": "Are you sure you want to detach this organization? The organization will continue to exist but will no longer be managed by the provider."
   },
   "add": {
-    "message": "Añadir"
+    "message": "Add"
   },
   "updatedMasterPassword": {
-    "message": "Contraseña maestra actualizada"
+    "message": "Updated Master Password"
   },
   "updateMasterPassword": {
-    "message": "Actualizar contraseña maestra"
+    "message": "Update Master Password"
   },
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "Vault Timeout"
   },
@@ -4341,10 +4338,10 @@
     "message": "Invalid Maximum Vault Timeout."
   },
   "hours": {
-    "message": "Horas"
+    "message": "Hours"
   },
   "minutes": {
-    "message": "Minutos"
+    "message": "Minutes"
   },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
@@ -4366,7 +4363,7 @@
     "message": "Your vault timeout exceeds the restriction set by your organization."
   },
   "disablePersonalVaultExport": {
-    "message": "Desactivar exportación de bóveda personal"
+    "message": "Disable Personal Vault Export"
   },
   "disablePersonalVaultExportDesc": {
     "message": "Prohibits users from exporting their private vault data."
@@ -4381,10 +4378,10 @@
     "message": "Select SSO Type"
   },
   "type": {
-    "message": "Tipo"
+    "message": "Type"
   },
   "openIdConnectConfig": {
-    "message": "Configuración de OpenID Connect"
+    "message": "OpenID Connect Configuration"
   },
   "samlSpConfig": {
     "message": "SAML Service Provider Configuration"
@@ -4399,7 +4396,7 @@
     "message": "Signed Out Callback Path"
   },
   "authority": {
-    "message": "Autoridad"
+    "message": "Authority"
   },
   "clientId": {
     "message": "Client ID"
@@ -4720,13 +4717,13 @@
     "message": "New Families Organization"
   },
   "acceptOffer": {
-    "message": "Aceptar oferta"
+    "message": "Accept Offer"
   },
   "sponsoringOrg": {
-    "message": "Organización patrocinadora"
+    "message": "Sponsoring Organization"
   },
   "keyConnectorTest": {
-    "message": "Probar"
+    "message": "Test"
   },
   "keyConnectorTestSuccess": {
     "message": "Success! Key Connector reached."
@@ -4735,9 +4732,9 @@
     "message": "Cannot reach Key Connector. Check URL."
   },
   "sponsorshipTokenHasExpired": {
-    "message": "La oferta de patrocinio expiró."
+    "message": "The sponsorship offer has expired."
   },
   "freeWithSponsorship": {
-    "message": "GRATIS con patrocinio"
+    "message": "FREE with sponsorship"
   }
 }

src/locales/et/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Organisatsiooni administraator muutis hiljuti sinu ülemparooli. Hoidlale ligi pääsemiseks pead ülemparooli uuendama. Jätkates logitakse sind käimasolevast sessioonist välja, misjärel nõutakse uuesti sisselogimist. Teistes seadmetes olevad aktiivsed sessioonid jäävad aktiivseks kuni üheks tunniks."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "Vault Timeout"
   },

src/locales/fi/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Organisaatiosi ylläpito on hiljattain vaihtanut pääsalasanasi. Käyttääksesi holvia, on sinun päivitettävä se nyt. Tämä uloskirjaa kaikki nykyiset istunnot pakottaen uudelleenkirjautumisen. Muiden laitteiden aktiiviset istunnot saattavat toimia vielä tunnin ajan."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Pääsalasanasi ei vastaa organisaation käytäntöä. Liittyäksesi organisaatioon, on sinun päivitettävä se nyt. Tämä uloskirjaa kaikki nykyiset istunnot pakottaen uudelleenkirjautumisen. Muiden laitteiden aktiiviset istunnot saattavat toimia vielä tunnin ajan."
-  },
   "maximumVaultTimeout": {
     "message": "Holvin aikakatkaisu"
   },

src/locales/fil/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "Vault Timeout"
   },

src/locales/fr/messages.json

@@ -922,7 +922,7 @@
     }
   },
   "loggedOutWarning": {
-    "message": "En continuant, vous serez déconnecté de votre session actuelle et vous devrez vous reconnecter. Les sessions actives sur d'autres appareils peuvent rester actives pendant encore une heure."
+    "message": "En continuant vous serez déconnecté de votre session, ce qui nécessitera de vous reconnecter. Les sessions actives sur d'autres équipements peuvent continuer à rester actives pendant encore une heure."
   },
   "emailChanged": {
     "message": "Adresse e-mail modifiée"
@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Votre mot de passe maître a récemment été modifié par un administrateur de votre organisation. Pour accéder au coffre, vous devez mettre à jour votre mot de passe maître dès maintenant. Cette action va vous déconnecter et vous obligera à vous reconnecter. Les sessions actives sur d'autres appareils peuvent rester actives jusqu'à une heure."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Votre mot de passe maître ne répond pas aux exigences des politiques de cette organisation. Afin de rejoindre l'organisation, vous devez mettre à jour votre mot de passe maître maintenant. En continuant, vous serez déconnecté de votre session actuelle et vous devrez vous reconnecter. Les sessions actives sur d'autres appareils peuvent rester actives pendant encore une heure."
-  },
   "maximumVaultTimeout": {
     "message": "Délai d'expiration du coffre"
   },

src/locales/he/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "Vault Timeout"
   },

src/locales/hi/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "Vault Timeout"
   },

src/locales/hr/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Tvoju glavnu lozinku je nedavno promijenio administrator tvoje organizacije. Za pristup trezoru, potrebno je ažurirati glavnu lozinku, što će te odjaviti iz trenutne sesije, te ćeš se morati ponovno prijaviti. Aktivne sesije na drugim uređajima mogu ostati aktivne još sat vremena."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "Istek trezora"
   },

src/locales/hu/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "A mesterjelszót nemrégiben megváltoztatta a szervezet rendszergazdája. A tároló eléréséhez most frissíteni kell a mesterjelszót. A folytatás kijelentkeztet az aktuális munkamenetből és újra be kell jelentkezni. A más eszközökön végzett aktív munkamenetek akár egy órán keresztül is aktívak maradhatnak."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "A mesterjelszó nem felel meg a szervezet rendszabályainak. A szervezet eléréséhez most frissíteni kell a mesterjelszót. Továbblépéskor kijelentkezés történik a jelenlegi munkamenetből és újra be kell jelentkezni. Ha van aktív munkamenet más eszközön, az még legfeljebb egy óráig aktív maradhat."
-  },
   "maximumVaultTimeout": {
     "message": "Széf időkifutás"
   },

src/locales/id/messages.json

@@ -167,7 +167,7 @@
     "message": "Boolean"
   },
   "cfTypeLinked": {
-    "message": "Terhubung",
+    "message": "Linked",
     "description": "This describes a field that is 'linked' (related) to another field."
   },
   "remove": {
@@ -316,7 +316,7 @@
     "message": "Nama Belakang"
   },
   "fullName": {
-    "message": "Nama Lengkap"
+    "message": "Full Name"
   },
   "address1": {
     "message": "Alamat 1"
@@ -1006,7 +1006,7 @@
     "message": "Kubah organisasi yang dibersihkan."
   },
   "vaultAccessedByProvider": {
-    "message": "Brankas diakses oleh provider."
+    "message": "Vault accessed by provider."
   },
   "purgeVaultDesc": {
     "message": "Lanjutkan di bawah untuk menghapus semua item dan folder di lemari besi Anda. Item milik organisasi yang Anda bagikan tidak akan dihapus."
@@ -2249,7 +2249,7 @@
     "message": "Dikonfirmasi"
   },
   "clientOwnerEmail": {
-    "message": "Pemilik email klien"
+    "message": "Client Owner Email"
   },
   "owner": {
     "message": "Pemilik"
@@ -2594,7 +2594,7 @@
     }
   },
   "createdOrganizationId": {
-    "message": "Organisasi yang dibuat $ID$.",
+    "message": "Created organization $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2603,7 +2603,7 @@
     }
   },
   "addedOrganizationId": {
-    "message": "Organisasi yang ditambahkan $ID$.",
+    "message": "Added organization $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2660,7 +2660,7 @@
     "message": "Mengirim kembali undangan"
   },
   "resendEmail": {
-    "message": "Kirim Ulang Email"
+    "message": "Resend Email"
   },
   "hasBeenReinvited": {
     "message": "$USER$ telah diundang.",
@@ -2921,7 +2921,7 @@
     "message": "Subscription updated"
   },
   "additionalOptions": {
-    "message": "Opsi Tambahan"
+    "message": "Additional Options"
   },
   "additionalOptionsDesc": {
     "message": "For additional help in managing your subscription, please contact Customer Support."
@@ -2939,7 +2939,7 @@
     }
   },
   "subscriptionFreePlan": {
-    "message": "Anda tidak dapat mengundang lebih dari $COUNT$ user tanpa mengupgrade langganan.",
+    "message": "You cannot invite more than $COUNT$ users without upgrading your plan.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -3854,13 +3854,13 @@
     "message": "Kelola Semua Koleksi"
   },
   "createNewCollections": {
-    "message": "Buat Koleksi Baru"
+    "message": "Create New Collections"
   },
   "editAnyCollection": {
     "message": "Edit Any Collection"
   },
   "deleteAnyCollection": {
-    "message": "Hapus Koleksi"
+    "message": "Delete Any Collection"
   },
   "manageAssignedCollections": {
     "message": "Kelola Koleksi yang Ditugaskan"
@@ -4058,7 +4058,7 @@
     }
   },
   "eventResetSsoLink": {
-    "message": "Setel ulang tautan Sso untuk user $ID$",
+    "message": "Reset Sso link for user $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -4136,16 +4136,16 @@
     "message": "Items that have been in Trash for a while will be automatically deleted."
   },
   "passwordPrompt": {
-    "message": "Pengingat ulang sandi utama"
+    "message": "Master password re-prompt"
   },
   "passwordConfirmation": {
-    "message": "Konfirmasi sandi utama"
+    "message": "Master password confirmation"
   },
   "passwordConfirmationDesc": {
     "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
   },
   "reinviteSelected": {
-    "message": "Kirim Ulang Undangan"
+    "message": "Resend Invitations"
   },
   "noSelectedUsersApplicable": {
     "message": "This action is not applicable to any of the selected users."
@@ -4154,52 +4154,52 @@
     "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."
   },
   "theme": {
-    "message": "Tema"
+    "message": "Theme"
   },
   "themeDesc": {
-    "message": "Pilih tema untuk brankas web anda."
+    "message": "Choose a theme for your web vault."
   },
   "themeSystem": {
-    "message": "Gunakan Tema Sistem"
+    "message": "Use System Theme"
   },
   "themeDark": {
-    "message": "Gelap"
+    "message": "Dark"
   },
   "themeLight": {
-    "message": "Terang"
+    "message": "Light"
   },
   "confirmSelected": {
-    "message": "Konfirmasi Pilihan"
+    "message": "Confirm Selected"
   },
   "bulkConfirmStatus": {
     "message": "Bulk action status"
   },
   "bulkConfirmMessage": {
-    "message": "Berhasil dikonfirmasi."
+    "message": "Confirmed successfully."
   },
   "bulkReinviteMessage": {
-    "message": "Berhasil mengundang kembali."
+    "message": "Reinvited successfully."
   },
   "bulkRemovedMessage": {
-    "message": "Penghapusan sukses"
+    "message": "Removed successfully"
   },
   "bulkFilteredMessage": {
     "message": "Excluded, not applicable for this action."
   },
   "fingerprint": {
-    "message": "Sidik Jari"
+    "message": "Fingerprint"
   },
   "removeUsers": {
-    "message": "Hapus pengguna"
+    "message": "Remove Users"
   },
   "error": {
-    "message": "Galat"
+    "message": "Error"
   },
   "resetPasswordManageUsers": {
     "message": "Manage Users must also be enabled with the Manage Password Reset permission"
   },
   "setupProvider": {
-    "message": "Pengaturan Provider"
+    "message": "Provider Setup"
   },
   "setupProviderLoginDesc": {
     "message": "You've been invited to setup a new provider. To continue, you need to log in or create a new Bitwarden account."
@@ -4208,22 +4208,22 @@
     "message": "Please enter the details below to complete the provider setup. Contact Customer Support if you have any questions."
   },
   "providerName": {
-    "message": "Nama Provider"
+    "message": "Provider Name"
   },
   "providerSetup": {
     "message": "The provider has been set up."
   },
   "clients": {
-    "message": "Klien"
+    "message": "Clients"
   },
   "providerAdmin": {
-    "message": "Admin Provider"
+    "message": "Provider Admin"
   },
   "providerAdminDesc": {
     "message": "The highest access user that can manage all aspects of your provider as well as access and manage client organizations."
   },
   "serviceUser": {
-    "message": "Layanan Pengguna"
+    "message": "Service User"
   },
   "serviceUserDesc": {
     "message": "Service users can access and manage all client organizations."
@@ -4232,7 +4232,7 @@
     "message": "Invite a new user to your provider by entering their Bitwarden account email address below. If they do not have a Bitwarden account already, they will be prompted to create a new account."
   },
   "joinProvider": {
-    "message": "Gabung Provider"
+    "message": "Join Provider"
   },
   "joinProviderDesc": {
     "message": "You've been invited to join the provider listed above. To accept the invitation, you need to log in or create a new Bitwarden account."
@@ -4250,16 +4250,16 @@
     "message": "Provider"
   },
   "newClientOrganization": {
-    "message": "Organisasi Klien Baru"
+    "message": "New Client Organization"
   },
   "newClientOrganizationDesc": {
     "message": "Create a new client organization that will be associated with you as the provider. You will be able to access and manage this organization."
   },
   "addExistingOrganization": {
-    "message": "Tambah Organisasi yang sudah ada"
+    "message": "Add Existing Organization"
   },
   "myProvider": {
-    "message": "Provider Saya"
+    "message": "My Provider"
   },
   "addOrganizationConfirmation": {
     "message": "Are you sure you want to add $ORGANIZATION$ as a client to $PROVIDER$?",
@@ -4287,10 +4287,10 @@
     }
   },
   "providerIsDisabled": {
-    "message": "Provider dinonaktifkan."
+    "message": "Provider is disabled."
   },
   "providerUpdated": {
-    "message": "Provider diperbarui"
+    "message": "Provider updated"
   },
   "yourProviderIs": {
     "message": "Your provider is $PROVIDER$. They have administrative and billing privileges for your organization.",
@@ -4314,20 +4314,17 @@
     "message": "Are you sure you want to detach this organization? The organization will continue to exist but will no longer be managed by the provider."
   },
   "add": {
-    "message": "Tambah"
+    "message": "Add"
   },
   "updatedMasterPassword": {
-    "message": "Kata Sandi Telah Diperbarui"
+    "message": "Updated Master Password"
   },
   "updateMasterPassword": {
-    "message": "Perbarui Kata Sandi Utama"
+    "message": "Update Master Password"
   },
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "Vault Timeout"
   },
@@ -4341,10 +4338,10 @@
     "message": "Invalid Maximum Vault Timeout."
   },
   "hours": {
-    "message": "Jam"
+    "message": "Hours"
   },
   "minutes": {
-    "message": "Menit"
+    "message": "Minutes"
   },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
@@ -4381,7 +4378,7 @@
     "message": "Select SSO Type"
   },
   "type": {
-    "message": "Tipe"
+    "message": "Type"
   },
   "openIdConnectConfig": {
     "message": "OpenID Connect Configuration"
@@ -4399,16 +4396,16 @@
     "message": "Signed Out Callback Path"
   },
   "authority": {
-    "message": "Otoritas"
+    "message": "Authority"
   },
   "clientId": {
-    "message": "ID Klien"
+    "message": "Client ID"
   },
   "clientSecret": {
-    "message": "Rahasia Klien"
+    "message": "Client Secret"
   },
   "metadataAddress": {
-    "message": "Alamat Metadata"
+    "message": "Metadata Address"
   },
   "oidcRedirectBehavior": {
     "message": "OIDC Redirect Behavior"

src/locales/it/messages.json

@@ -371,7 +371,7 @@
     "message": "Sposta in organizzazione"
   },
   "valueCopied": {
-    "message": "$VALUE$ copiata",
+    "message": "$VALUE$ copiato",
     "description": "Value has been copied to the clipboard.",
     "placeholders": {
       "value": {
@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "La tua password principale è stata recentemente modificata da un amministratore nella tua organizzazione. Per accedere alla cassaforte, aggiorna ora la password. Procedendo sarai disconnesso dalla sessione attuale e ti sarà richiesto di effettuare nuovamente l'accesso. Le sessioni attive su altri dispositivi potrebbero continuare a rimanere attive per un massimo di un'ora."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "La tua password principale non soddisfa i requisiti della politica di questa organizzazione. Per aderire all'organizzazione, è necessario aggiornare subito la password principale. Il procedimento chiuderà la sessione attuale, richiedendo di accedere nuovamente. Le sessioni attive su altri dispositivi possono rimanere tali fino a un'ora."
-  },
   "maximumVaultTimeout": {
     "message": "Timeout cassaforte"
   },

src/locales/ja/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "あなたのマスターパスワードは、この組織のポリシー要件を満たしていません。組織に参加するには、マスターパスワードを更新してください。 続行すると現在のセッションからログアウトするため、再ログインが必要です。 他のデバイスでのアクティブなセッションは、最大1時間アクティブになり続けることができます。"
-  },
   "maximumVaultTimeout": {
     "message": "Vault Timeout"
   },

src/locales/ka/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "Vault Timeout"
   },

src/locales/km/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "Vault Timeout"
   },

src/locales/kn/messages.json

@@ -167,7 +167,7 @@
     "message": "ಬೂಲಿಯನ್"
   },
   "cfTypeLinked": {
-    "message": "ಸಂಪರ್ಕಿತ",
+    "message": "Linked",
     "description": "This describes a field that is 'linked' (related) to another field."
   },
   "remove": {
@@ -316,7 +316,7 @@
     "message": "ಕೊನೆ ಹೆಸರು"
   },
   "fullName": {
-    "message": "ಪೂರ್ಣ ಹೆಸರು"
+    "message": "Full Name"
   },
   "address1": {
     "message": "ವಿಳಾಸ 1"
@@ -2660,7 +2660,7 @@
     "message": "ಆಹ್ವಾನವನ್ನು ಮರುಹೊಂದಿಸಿ"
   },
   "resendEmail": {
-    "message": "ಇಮೇಲ್‌ ಮತ್ತೊಮ್ಮೆ ಕಳುಹಿಸಿ"
+    "message": "Resend Email"
   },
   "hasBeenReinvited": {
     "message": "$USER$ ಅನ್ನು ಮರುಸೃಷ್ಟಿಸಲಾಗಿದೆ.",
@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "Vault Timeout"
   },

src/locales/ko/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "보관함 시간 제한"
   },

src/locales/lv/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Apvienības pārvaldnieks nesen nomainīja galveno paroli. Lai piekļūtu glabātavai, tā ir jāatjaunina. Turpinot tiks izbeigta pašreizējā sesija un tiks pieprasīta atkārtota pierakstīšanās. Esošās sesijas citās iekārtās var turpināt darboties līdz vienai stundai."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Galvenā parole neatbilst apvienības nosacījumu prasībām. Lai pievienotos apvienībai, ir nepieciešams atjaunināt galveno paroli. Turpinot notiks izrakstīšanās no pašreizējās sesijas, pieprasot atkal pierakstīties. Esošās sesijas citās iekārtās var turpināt darboties līdz vienai stundai."
-  },
   "maximumVaultTimeout": {
     "message": "Glabātavas noildze"
   },
@@ -4495,16 +4492,16 @@
     "message": "Vienotās pieteikšanās uzstādījumi tika saglabāti."
   },
   "sponsoredFamilies": {
-    "message": "Bezmaksas Bitwarden ģimenēm"
+    "message": "Bezmaksas Bitwarden Families"
   },
   "sponsoredFamiliesEligible": {
     "message": "Tu un Tava ģimene esat atbilstīgi bezmaksas Bitwarden Families. Piesakies ar personīgo e-pasta adresi, lai turētu datus drošībā pat tad, kad neesi darbā!"
   },
   "sponsoredFamiliesEligibleCard": {
-    "message": "Izmanto savu bezmaksas Bitwarden ģimenēm šodien, lai turētu datus drošībā pat tad, kad neesi darbā."
+    "message": "Redeem your Free Bitwarden for Families plan today to keep your data secure even when you are not at work."
   },
   "sponsoredFamiliesInclude": {
-    "message": "Bitwarden ģimenēm iekļauj"
+    "message": "The Bitwarden for Families plan include"
   },
   "sponsoredFamiliesPremiumAccess": {
     "message": "Premium piekļuve līdz 6 lietotājiem"
@@ -4516,31 +4513,31 @@
     "message": "Saite vairs nav derīga. Lūdz pabalstītāju atkārtoti nosūtīt piedāvājumu!"
   },
   "reclaimedFreePlan": {
-    "message": "Mainīts uz bezmaksas plānu"
+    "message": "Reclaimed free plan"
   },
   "redeem": {
     "message": "Izmantot"
   },
   "sponsoredFamiliesSelectOffer": {
-    "message": "Atlastīt apvienību, kuru atbalstīt"
+    "message": "Select the organization you would like sponsored"
   },
   "familiesSponsoringOrgSelect": {
     "message": "Kuru bezmaksas ģimeņu piedāvājumu Tu vēlies izmantot?"
   },
   "sponsoredFamiliesEmail": {
-    "message": "Ievadīt personīgo e-pasta adresi, lai izmantotu Bitwarden ģimenēm"
+    "message": "Enter your personal email to redeem Bitwarden Families"
   },
   "sponsoredFamiliesLeaveCopy": {
-    "message": "Ja Tu pamet vai tiec noņemts no atbalstošās apvienības, Tavs ģimeņu plāns beigsies apmaksas laika posma beigās."
+    "message": "If you leave or are removed from the sponsoring organization, your Families plan will expire at the end of the billing period."
   },
   "acceptBitwardenFamiliesHelp": {
-    "message": "Pieņemt piedāvājumu esošai apvienībai vai izveidot jaunu ģimenes apvienību."
+    "message": "Accept offer for an existing organization or create a new Families organization."
   },
   "setupSponsoredFamiliesLoginDesc": {
-    "message": "Tev ir piedāvāta bezmaksas Bitwarden ģimenēm apvienība. Lai turpinātu, ir nepieciešams pierakstītites kontā, kas saņēma piedāvājumu."
+    "message": "You've been offered a free Bitwarden Families Plan Organization. To continue, you need to log in to the account that received the offer."
   },
   "sponsoredFamiliesAcceptFailed": {
-    "message": "Nav iespējams pieņemt piedāvājumu. Lūgums pārsūtīt piedāvājuma e-pasta ziņu no uzņēmējdarbības konta un mēģināt vēlreiz."
+    "message": "Unable to accept offer. Please resend the offer email from your enterprise account and try again."
   },
   "sponsoredFamiliesAcceptFailedShort": {
     "message": "Nav iespējams apstiprināt piedāvājumu. $DESCRIPTION$",
@@ -4552,10 +4549,10 @@
     }
   },
   "sponsoredFamiliesOffer": {
-    "message": "Pieņemt bezmaksas Bitwarden ģimenēm"
+    "message": "Accept Free Bitwarden Families"
   },
   "sponsoredFamiliesOfferRedeemed": {
-    "message": "Bezmaksas Bitwarden ģimenēm piedāvājums veiksmīgi izmantots"
+    "message": "Free Bitwarden Families offer successfully redeemed"
   },
   "redeemed": {
     "message": "Izmantots"
@@ -4582,13 +4579,13 @@
     }
   },
   "freeFamiliesPlan": {
-    "message": "Bezmaksas ģimenes plāns"
+    "message": "Free Families Plan"
   },
   "redeemNow": {
-    "message": "Izmantot tagad"
+    "message": "Redeem Now"
   },
   "recipient": {
-    "message": "Saņēmējs"
+    "message": "Recipient"
   },
   "removeSponsorship": {
     "message": "Noņemt pabalstītājdarbību"

src/locales/ml/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "Vault Timeout"
   },

src/locales/nb/messages.json

@@ -3529,21 +3529,21 @@
     "message": "Utløpsdato"
   },
   "expirationDateDesc": {
-    "message": "Hvis satt, vil tilgang til denne Send gå ut på angitt dato og klokkeslett.",
+    "message": "If set, access to this Send will expire on the specified date and time.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "maxAccessCount": {
-    "message": "Maksimal antall tilganger"
+    "message": "Maximum Access Count"
   },
   "maxAccessCountDesc": {
-    "message": "Hvis satt, vil ikke brukere lenger ha tilgang til dette Send når maksimal antall tilgang er nådd.",
+    "message": "If set, users will no longer be able to access this Send once the maximum access count is reached.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "currentAccessCount": {
-    "message": "Antall nåværende tilganger"
+    "message": "Current Access Count"
   },
   "sendPasswordDesc": {
-    "message": "Eventuelt krever et passord for brukere å få tilgang til denne Send.",
+    "message": "Optionally require a password for users to access this Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendNotesDesc": {
@@ -3793,7 +3793,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendOptions": {
-    "message": "Alternativer for sending",
+    "message": "Send Options",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendOptionsPolicyDesc": {
@@ -3839,28 +3839,28 @@
     "message": "Rettigheter"
   },
   "accessEventLogs": {
-    "message": "Få tilgang til hendelseslogger"
+    "message": "Access Event Logs"
   },
   "accessImportExport": {
-    "message": "Få tilgang til importering/eksportering"
+    "message": "Access Import/Export"
   },
   "accessReports": {
-    "message": "Få tilgang til rapporter"
+    "message": "Access Reports"
   },
   "missingPermissions": {
-    "message": "Du mangler de nødvendige tillatelsene for å utføre denne handlingen."
+    "message": "You lack the necessary permissions to perform this action."
   },
   "manageAllCollections": {
     "message": "Administrer alle samlinger"
   },
   "createNewCollections": {
-    "message": "Opprett nye samlinger"
+    "message": "Create New Collections"
   },
   "editAnyCollection": {
-    "message": "Rediger enhver samling"
+    "message": "Edit Any Collection"
   },
   "deleteAnyCollection": {
-    "message": "Slett enhver samling"
+    "message": "Delete Any Collection"
   },
   "manageAssignedCollections": {
     "message": "Administrer alle tildelte samlinger"
@@ -3884,7 +3884,7 @@
     "message": "Administrer brukere"
   },
   "manageResetPassword": {
-    "message": "Behandle tilbakestilling av passord"
+    "message": "Manage Password Reset"
   },
   "disableRequiredError": {
     "message": "You must manually disable the $POLICYNAME$ policy before this policy can be disabled.",
@@ -3896,7 +3896,7 @@
     }
   },
   "personalOwnershipPolicyInEffect": {
-    "message": "En bedriftsretningslinje påvirker dine eierskapsinnstillinger."
+    "message": "An organization policy is affecting your ownership options."
   },
   "personalOwnershipPolicyInEffectImports": {
     "message": "An organization policy has disabled importing items into your personal vault."
@@ -4004,7 +4004,7 @@
     "message": "For å verifisere din 2FA vennligst klikk knappen nedenfor."
   },
   "webAuthnAuthenticate": {
-    "message": "Autentiser WebAuthn"
+    "message": "Authenticate WebAuthn"
   },
   "webAuthnNotSupported": {
     "message": "WebAuthn støttes ikke i denne nettleseren."
@@ -4025,7 +4025,7 @@
     "message": "Withdraw from Password Reset"
   },
   "enrollPasswordResetSuccess": {
-    "message": "Innrulleringssuksess!"
+    "message": "Enrollment success!"
   },
   "withdrawPasswordResetSuccess": {
     "message": "Withdrawal success!"
@@ -4100,7 +4100,7 @@
     "message": "Enrollment will allow organization administrators to change your master password. Are you sure you want to enroll?"
   },
   "resetPasswordPolicy": {
-    "message": "Tilbakestill hovedpassord"
+    "message": "Master Password Reset"
   },
   "resetPasswordPolicyDescription": {
     "message": "Allow administrators in the organization to reset organization users' master password."
@@ -4290,7 +4290,7 @@
     "message": "Leverandør er deaktivert."
   },
   "providerUpdated": {
-    "message": "Leverandøren er oppdatert"
+    "message": "Provider updated"
   },
   "yourProviderIs": {
     "message": "Your provider is $PROVIDER$. They have administrative and billing privileges for your organization.",
@@ -4314,22 +4314,19 @@
     "message": "Are you sure you want to detach this organization? The organization will continue to exist but will no longer be managed by the provider."
   },
   "add": {
-    "message": "Legg til"
+    "message": "Add"
   },
   "updatedMasterPassword": {
-    "message": "Oppdaterte hovedpassordet"
+    "message": "Updated Master Password"
   },
   "updateMasterPassword": {
-    "message": "Oppdater hovedpassord"
+    "message": "Update Master Password"
   },
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
-    "message": "Tidsavbrudd i hvelvet"
+    "message": "Vault Timeout"
   },
   "maximumVaultTimeoutDesc": {
     "message": "Configure a maximum vault timeout for all users."
@@ -4341,13 +4338,13 @@
     "message": "Invalid Maximum Vault Timeout."
   },
   "hours": {
-    "message": "Åpningstider"
+    "message": "Hours"
   },
   "minutes": {
-    "message": "Minutter"
+    "message": "Minutes"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Organisasjonens retningslinjer påvirker tidsavbruddet for hvelvet ditt. Maksimalt tillatt tidsavbrudd for hvelv er $HOURS$ time(r) og $MINUTES$ minutt(er)",
+    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -4372,16 +4369,16 @@
     "message": "Prohibits users from exporting their private vault data."
   },
   "vaultExportDisabled": {
-    "message": "Hvelveksportering er skrudd av"
+    "message": "Vault Export Disabled"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "En eller flere regler i organisasjonsoppsettet forhindrer deg i å eksportere ditt personlige hvelv."
+    "message": "One or more organization policies prevents you from exporting your personal vault."
   },
   "selectType": {
-    "message": "Velg SSO-type"
+    "message": "Select SSO Type"
   },
   "type": {
-    "message": "Skriv"
+    "message": "Type"
   },
   "openIdConnectConfig": {
     "message": "OpenID Connect Configuration"
@@ -4399,16 +4396,16 @@
     "message": "Signed Out Callback Path"
   },
   "authority": {
-    "message": "Autoritet"
+    "message": "Authority"
   },
   "clientId": {
-    "message": "Klient-ID"
+    "message": "Client ID"
   },
   "clientSecret": {
-    "message": "Klienthemmelighet"
+    "message": "Client Secret"
   },
   "metadataAddress": {
-    "message": "Metadataadresse"
+    "message": "Metadata Address"
   },
   "oidcRedirectBehavior": {
     "message": "OIDC Redirect Behavior"
@@ -4438,13 +4435,13 @@
     "message": "SP Entity ID"
   },
   "spMetadataUrl": {
-    "message": "'SAML 2.0'-metadata-URL"
+    "message": "SAML 2.0 Metadata URL"
   },
   "spAcsUrl": {
     "message": "Assertion Consumer Service (ACS) URL"
   },
   "spNameIdFormat": {
-    "message": "Navne-ID-format"
+    "message": "Name ID Format"
   },
   "spOutboundSigningAlgorithm": {
     "message": "Outbound Signing Algorithm"
@@ -4459,10 +4456,10 @@
     "message": "Want Assertions Signed"
   },
   "spValidateCertificates": {
-    "message": "Valider sertifikater"
+    "message": "Validate Certificates"
   },
   "idpEntityId": {
-    "message": "Enhets-ID"
+    "message": "Entity ID"
   },
   "idpBindingType": {
     "message": "Binding Type"
@@ -4477,7 +4474,7 @@
     "message": "Artifact Resolution Service URL"
   },
   "idpX509PublicCert": {
-    "message": "X509 offentlig sertifikat"
+    "message": "X509 Public Certificate"
   },
   "idpOutboundSigningAlgorithm": {
     "message": "Outbound Signing Algorithm"
@@ -4558,7 +4555,7 @@
     "message": "Free Bitwarden Families offer successfully redeemed"
   },
   "redeemed": {
-    "message": "Innløst"
+    "message": "Redeemed"
   },
   "redeemedAccount": {
     "message": "Redeemed Account"
@@ -4585,10 +4582,10 @@
     "message": "Free Families Plan"
   },
   "redeemNow": {
-    "message": "Løs inn nå"
+    "message": "Redeem Now"
   },
   "recipient": {
-    "message": "Mottaker"
+    "message": "Recipient"
   },
   "removeSponsorship": {
     "message": "Remove Sponsorship"
@@ -4600,10 +4597,10 @@
     "message": "Sponsorship Created"
   },
   "revoke": {
-    "message": "Tilbakekall"
+    "message": "Revoke"
   },
   "emailSent": {
-    "message": "E-post sendt"
+    "message": "Email Sent"
   },
   "revokeSponsorshipConfirmation": {
     "message": "After removing this account, the Families organization owner will be responsible for this subscription and related invoices. Are you sure you want to continue?"
@@ -4618,28 +4615,28 @@
     "message": "Key Connector URL"
   },
   "sendVerificationCode": {
-    "message": "Send en bekreftelseskode til E-postadressen din"
+    "message": "Send a verification code to your email"
   },
   "sendCode": {
-    "message": "Send kode"
+    "message": "Send Code"
   },
   "codeSent": {
-    "message": "Kode sendt"
+    "message": "Code Sent"
   },
   "verificationCode": {
-    "message": "Verifiseringskode"
+    "message": "Verification Code"
   },
   "confirmIdentity": {
-    "message": "Bekreft identiteten din for å fortsette."
+    "message": "Confirm your identity to continue."
   },
   "verificationCodeRequired": {
-    "message": "En verifiseringskode er påkrevd."
+    "message": "Verification code is required."
   },
   "invalidVerificationCode": {
-    "message": "Ugyldig bekreftelseskode"
+    "message": "Invalid verification code"
   },
   "convertOrganizationEncryptionDesc": {
-    "message": "$ORGANIZATION$ bruker SSO med en selvdrevet nøkkelserver. Et hovedpassord er ikke lenger nødvendig for å logge inn for medlemmer av denne organisasjonen.",
+    "message": "$ORGANIZATION$ is using SSO with a self-hosted key server. A master password is no longer required to log in for members of this organization.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -4648,22 +4645,22 @@
     }
   },
   "leaveOrganization": {
-    "message": "Forlat organisasjonen"
+    "message": "Leave Organization"
   },
   "removeMasterPassword": {
-    "message": "Fjern hovedpassord"
+    "message": "Remove Master Password"
   },
   "removedMasterPassword": {
-    "message": "Hovedpassordet er fjernet."
+    "message": "Master password removed."
   },
   "allowSso": {
-    "message": "Tillat SSO-autentisering"
+    "message": "Allow SSO authentication"
   },
   "allowSsoDesc": {
     "message": "Once set up, your configuration will be saved and members will be able to authenticate using their Identity Provider credentials."
   },
   "ssoPolicyHelpStart": {
-    "message": "Skru på",
+    "message": "Enable the",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Enable the SSO Authentication policy to require all members to log in with SSO.'"
   },
   "ssoPolicyHelpLink": {
@@ -4693,10 +4690,10 @@
     "message": "\"Login with SSO and Key Connector Decryption\" is enabled. This policy will only apply to Owners and Admins."
   },
   "enabledSso": {
-    "message": "Skrudde på SSO"
+    "message": "Enabled SSO"
   },
   "disabledSso": {
-    "message": "Skrudde av SSO"
+    "message": "Disabled SSO"
   },
   "enabledKeyConnector": {
     "message": "Enabled Key Connector"
@@ -4720,7 +4717,7 @@
     "message": "New Families Organization"
   },
   "acceptOffer": {
-    "message": "Aksepter tilbudet"
+    "message": "Accept Offer"
   },
   "sponsoringOrg": {
     "message": "Sponsoring Organization"

src/locales/nl/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Je hoofdwachtwoord is onlangs veranderd door een beheerder in jouw organisatie. Om toegang te krijgen tot de kluis, moet je deze nu bijwerken. Doorgaan zal je huidige sessie uitloggen, waarna je opnieuw moet inloggen. Actieve sessies op andere apparaten blijven mogelijk nog een uur actief."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Je hoofdwachtwoord voldoet niet aan het beleid van deze organisatie. Om lid te worden van deze organisatie, moet je nu je hoofdwachtwoord veranderen. Als je doorgaat moet je opnieuw inloggen. Sessies op andere apparaten blijven mogelijk nog een uur actief."
-  },
   "maximumVaultTimeout": {
     "message": "Time-out van de kluis"
   },

src/locales/nn/messages.json

@@ -177,17 +177,17 @@
     "message": "Unassigned"
   },
   "noneFolder": {
-    "message": "Ingen mappe",
+    "message": "No Folder",
     "description": "This is the folder for uncategorized items"
   },
   "addFolder": {
-    "message": "Legg til mappe"
+    "message": "Add Folder"
   },
   "editFolder": {
-    "message": "Rediger mappe"
+    "message": "Edit Folder"
   },
   "baseDomain": {
-    "message": "Grunndomene"
+    "message": "Base domain"
   },
   "host": {
     "message": "Host",
@@ -650,7 +650,7 @@
     "message": "There are no groups to list."
   },
   "noUsersInList": {
-    "message": "Det er inga brukarar å lista opp."
+    "message": "There are no users to list."
   },
   "noEventsInList": {
     "message": "There are no events to list."
@@ -698,7 +698,7 @@
     "message": "Send verification code email again"
   },
   "useAnotherTwoStepMethod": {
-    "message": "Bruk ein annan tofaktormetode for pålogging"
+    "message": "Use another two-step login method"
   },
   "insertYubiKey": {
     "message": "Insert your YubiKey into your computer's USB port, then touch its button."
@@ -728,7 +728,7 @@
     "message": "Authenticator App"
   },
   "authenticatorAppDesc": {
-    "message": "Bruk ein app for autentisering (til dømes Authy eller Google Authenticator) for å generera tidsavgrensa verifiseringskodar.",
+    "message": "Use an authenticator app (such as Authy or Google Authenticator) to generate time-based verification codes.",
     "description": "'Authy' and 'Google Authenticator' are product names and should not be translated."
   },
   "yubiKeyTitle": {
@@ -1153,7 +1153,7 @@
     "message": "New Custom Domain"
   },
   "newCustomDomainDesc": {
-    "message": "Legg inn ei liste med domener, skilt med komma. Berre \"grunndomener\" vert godteke. Ikkje skriv inn subdomener (underdomener). Skriv til dømes \"google.com\" i staden for \"www.google.com\". Du kan òg skriva \"androidapp://package.name\" for å knyta ein Android-app mot domener til heimesider."
+    "message": "Enter a list of domains separated by commas. Only \"base\" domains are allowed. Do not enter subdomains. For example, enter \"google.com\" instead of \"www.google.com\". You can also enter \"androidapp://package.name\" to associate an android app with other website domains."
   },
   "customDomainX": {
     "message": "Custom Domain $INDEX$",
@@ -1513,13 +1513,13 @@
     "message": "No items in your vault have weak passwords."
   },
   "reusedPasswordsReport": {
-    "message": "Rapport over passord som er brukt fleire gongar"
+    "message": "Reused Passwords Report"
   },
   "reusedPasswordsReportDesc": {
-    "message": "Om ei teneste du nyttar vert avslørt eller kompromittert, vil gjenbruk av passord gjer det enkelt for angriparen å få tilgang til dei andre kontoane du har på nettet. Bruk ulike og unike passord på kontoane og tenestene du har."
+    "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."
   },
   "reusedPasswordsFound": {
-    "message": "Gjenbrukte passord blei funne"
+    "message": "Reused Passwords Found"
   },
   "reusedPasswordsFoundDesc": {
     "message": "We found $COUNT$ passwords that are being reused in your vault. You should change them to a unique value.",
@@ -2111,7 +2111,7 @@
     "message": "Annually"
   },
   "basePrice": {
-    "message": "Grunnpris"
+    "message": "Base Price"
   },
   "organizationCreated": {
     "message": "Organization Created"
@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "Vault Timeout"
   },

src/locales/pl/messages.json

@@ -922,7 +922,7 @@
     }
   },
   "loggedOutWarning": {
-    "message": "Ta czynność spowoduje wylogowanie z bieżącej sesji, przez co konieczne będzie ponowne zalogowanie się. Aktywne sesje na innych urządzeniach mogą pozostać aktywne przez maksymalnie godzinę."
+    "message": "Kontynuowanie spowoduje wylogowanie Cię z obecnej sesji i będziesz musiał zalogować się ponownie. Aktywne sesje na innych urządzeniach mogą pozostać aktywne przez maksymalnie godzinę."
   },
   "emailChanged": {
     "message": "Adres e-mail został zmieniony"
@@ -994,7 +994,7 @@
     "message": "Martwisz się, że jesteś zalogowany na innym urządzeniu? Przejdź poniżej, aby wylogować się ze wszystkich komputerów, których wcześniej używałeś. Ta czynność jest zalecana, jeśli korzystałeś z publicznego komputera lub przypadkowo zapisałeś swoje hasło na cudzym urządzeniu. Ta czynność wyczyści również wszystkie sesje z zapamiętanym logowaniem dwustopniowym."
   },
   "deauthorizeSessionsWarning": {
-    "message": "Ta czynność spowoduje wylogowanie z bieżącej sesji, przez co konieczne będzie ponowne zalogowanie się. Zostaniesz również poproszony o ponowne logowanie dwustopniowe, jeśli masz włączoną tę opcję. Aktywne sesje na innych urządzeniach mogą pozostać aktywne przez maksymalnie godzinę."
+    "message": "Kontynuowanie spowoduje wylogowanie z obecnej sesji i będziesz musiał zalogować się ponownie. Zostaniesz również poproszony o ponowne logowanie dwustopniowe, jeśli masz włączoną tę opcję. Aktywne sesje na innych urządzeniach mogą pozostać aktywne przez maksymalnie godzinę."
   },
   "sessionsDeauthorized": {
     "message": "Wszystkie sesje zostały zakończone"
@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Hasło główne zostało zmienione przez administratora Twojej organizacji. Musisz je zaktualizować, aby uzyskać dostęp do sejfu. Ta czynność spowoduje wylogowanie z bieżącej sesji, przez co konieczne będzie ponowne zalogowanie się. Aktywne sesje na innych urządzeniach mogą pozostać aktywne przez maksymalnie godzinę."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Hasło główne nie spełnia wymagań zasad organizacji. Aby dołączyć do organizacji, musisz zaktualizować je. Ta czynność spowoduje wylogowanie z bieżącej sesji, przez co konieczne będzie ponowne zalogowanie się. Aktywne sesje na innych urządzeniach mogą pozostać aktywne przez maksymalnie godzinę."
-  },
   "maximumVaultTimeout": {
     "message": "Blokowanie sejfu"
   },

src/locales/pt_BR/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Sua Senha Mestra foi alterada recentemente por um administrador em sua organização. Para acessar o cofre, você deve atualizar sua Senha Mestra agora. Prosseguir irá desconectá-lo da sessão atual, exigindo que você faça login novamente. As sessões ativas em outros dispositivos podem continuar ativas por até uma hora."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "Tempo Limite do Cofre"
   },

src/locales/pt_PT/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "Vault Timeout"
   },

src/locales/ro/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Parola dvs. principală a fost modificată recent de unul din administratorii organizației dvs. Pentru a accesa seiful, trebuie să o actualizați acum. Procedura vă va deconecta de la sesiunea curentă, necesitând să vă reconectați. Sesiunile active de pe alte dispozitive pot continua să rămână active timp de până la o oră."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Parola dvs. principală nu îndeplinește cerințele politicii acestei organizații. Pentru a vă alătura organizației, trebuie să vă actualizați acum parola principală. Continuarea vă va deconecta de la sesiunea curentă, fiind necesar să vă autentificați din nou. Sesiunile active pe alte dispozitive pot continua să rămână active timp de până la o oră."
-  },
   "maximumVaultTimeout": {
     "message": "Expirare seif"
   },

src/locales/ru/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Мастер-пароль недавно был изменен администратором вашей организации. Чтобы получить доступ к хранилищу, вы должны обновить мастер-пароль сейчас. В результате текущая сессия будет завершена, потребуется повторный вход. Активные сессии на других устройствах могут оставаться активными в течение одного часа."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Мастер-пароль не соответствует требованиям политики этой организации. Чтобы присоединиться к организации, нужно обновить мастер-пароль. Текущая сессия будет завершена и потребуется повторный вход. Сессии на других устройствах могут оставаться активными в течение часа."
-  },
   "maximumVaultTimeout": {
     "message": "Тайм-аут хранилища"
   },

src/locales/si/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "Vault Timeout"
   },

src/locales/sk/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Vaše hlavné heslo nedávno zmenil správca vo vašej organizácii. Ak chcete získať prístup k trezoru, musíte aktualizovať vaše hlavné heslo teraz. Pokračovaním sa odhlásite z aktuálnej relácie a budete sa musieť znova prihlásiť. Aktívne relácie na iných zariadeniach môžu zostať aktívne až jednu hodinu."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Vaše hlavné heslo nespĺňa pravidlá tejto organizácie. Ak sa chcete pripojiť k tejto organizácii, musíte teraz aktualizovať vaše hlavné heslo. Pokračovaním sa odhlásite z aktuálnej relácie a budete sa musieť znova prihlásiť. Aktívne relácie na iných zariadeniach môžu zostať aktívne až jednu hodinu."
-  },
   "maximumVaultTimeout": {
     "message": "Časový limit pre trezor"
   },

src/locales/sl/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "Vault Timeout"
   },

src/locales/sr/messages.json

@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "Vault Timeout"
   },

src/locales/sv/messages.json

@@ -316,7 +316,7 @@
     "message": "Efternamn"
   },
   "fullName": {
-    "message": "Fullständigt namn"
+    "message": "Full Name"
   },
   "address1": {
     "message": "Adress 1"
@@ -4325,9 +4325,6 @@
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
-  "masterPasswordInvalidWarning": {
-    "message": "Your Master Password does not meet the policy requirements of this organization. In order to join the organization, you must update your Master Password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
-  },
   "maximumVaultTimeout": {
     "message": "Vault Timeout"
   },
@@ -4564,7 +4561,7 @@
     "message": "Redeemed Account"
   },
   "revokeAccount": {
-    "message": "Återkalla konto $NAME$",
+    "message": "Revoke account $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -4618,7 +4615,7 @@
     "message": "Key Connector URL"
   },
   "sendVerificationCode": {
-    "message": "Skicka en verifieringskod till din e-postadress"
+    "message": "Skicka en verifieringskod till din e-post"
   },
   "sendCode": {
     "message": "Skicka kod"
@@ -4627,7 +4624,7 @@
     "message": "Kod har skickats"
   },
   "verificationCode": {
-    "message": "Verifieringskod"
+    "message": "Verification Code"
   },
   "confirmIdentity": {
     "message": "Bekräfta din identitet för att fortsätta."
@@ -4636,7 +4633,7 @@
     "message": "Verification code is required."
   },
   "invalidVerificationCode": {
-    "message": "Ogiltig verifieringskod"
+    "message": "Invalid verification code"
   },
   "convertOrganizationEncryptionDesc": {
     "message": "$ORGANIZATION$ is using SSO with a self-hosted key server. A master password is no longer required to log in for members of this organization.",