From be95ee93285d25e7fcb9a1529a1ae26f0c1ad1a3 Mon Sep 17 00:00:00 2001
From: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com>
Date: Wed, 14 Oct 2020 08:58:23 -0500
Subject: [PATCH 01/14] [SSO] New user provision flow jslib update (f0dc38b ->
 d84d6da) (#570)

* Updated import/constructors

* Update jslib from f0dc38b -> d84d6da
---
 jslib                                      | 2 +-
 src/app/accounts/set-password.component.ts | 9 ++++++---
 src/app/accounts/two-factor.component.ts   | 9 ++++++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/jslib b/jslib
index f30d6f8027..d84d6da7f7 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit f30d6f8027055507abfdefd1eeb5d9aab25cc601
+Subproject commit d84d6da7f77ec89ba69299b1ff982f083fd77203
diff --git a/src/app/accounts/set-password.component.ts b/src/app/accounts/set-password.component.ts
index 85a71ee99a..295ded430f 100644
--- a/src/app/accounts/set-password.component.ts
+++ b/src/app/accounts/set-password.component.ts
@@ -1,6 +1,9 @@
 import { Component } from '@angular/core';
 
-import { Router } from '@angular/router';
+import {
+    ActivatedRoute,
+    Router,
+} from '@angular/router';
 
 import { ApiService } from 'jslib/abstractions/api.service';
 import { CryptoService } from 'jslib/abstractions/crypto.service';
@@ -25,9 +28,9 @@ export class SetPasswordComponent extends BaseSetPasswordComponent {
         cryptoService: CryptoService, messagingService: MessagingService,
         userService: UserService, passwordGenerationService: PasswordGenerationService,
         platformUtilsService: PlatformUtilsService, policyService: PolicyService, router: Router,
-        syncService: SyncService) {
+        syncService: SyncService, route: ActivatedRoute) {
         super(i18nService, cryptoService, messagingService, userService, passwordGenerationService,
-            platformUtilsService, policyService, router, apiService, syncService);
+            platformUtilsService, policyService, router, apiService, syncService, route);
     }
 
     get masterPasswordScoreWidth() {
diff --git a/src/app/accounts/two-factor.component.ts b/src/app/accounts/two-factor.component.ts
index 8e9033793d..9b46187f45 100644
--- a/src/app/accounts/two-factor.component.ts
+++ b/src/app/accounts/two-factor.component.ts
@@ -5,7 +5,10 @@ import {
     ViewContainerRef,
 } from '@angular/core';
 
-import { Router } from '@angular/router';
+import {
+    ActivatedRoute,
+    Router,
+} from '@angular/router';
 
 import { TwoFactorOptionsComponent } from './two-factor-options.component';
 
@@ -36,9 +39,9 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
         i18nService: I18nService, apiService: ApiService,
         platformUtilsService: PlatformUtilsService, syncService: SyncService,
         environmentService: EnvironmentService, private componentFactoryResolver: ComponentFactoryResolver,
-        stateService: StateService, storageService: StorageService) {
+        stateService: StateService, storageService: StorageService, route: ActivatedRoute) {
         super(authService, router, i18nService, apiService, platformUtilsService, window, environmentService,
-            stateService, storageService);
+            stateService, storageService, route);
         super.onSuccessfulLogin = () => {
             return syncService.fullSync(true);
         };

From 0dc2da052f8d2bb1beed337601c63d7b9358b60d Mon Sep 17 00:00:00 2001
From: Tom Rittson <trittson@gmail.com>
Date: Wed, 28 Oct 2020 17:35:00 +1000
Subject: [PATCH 02/14] expand contributing guide

---
 CONTRIBUTING.md | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0203956af7..8b23fe28d2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,32 @@
-Code contributions are welcome! Please commit any pull requests against the `master` branch.
+# How to Contribute
+
+Contributions of all kinds are welcome!
+
+Please visit our [Community Forums](https://community.bitwarden.com/) for general community discussion and the development roadmap.
+
+Here is how you can get involved:
+
+* **Request a new feature:** Go to the [Feature Requests category](https://community.bitwarden.com/c/feature-requests/) of the Community Forums. Please search existing feature requests before making a new one
+  
+* **Write code for a new feature:** Make a new post in the [Github Contributions category](https://community.bitwarden.com/c/github-contributions/) of the Community Forums. Include a description of your proposed contribution, screeshots, and links to any relevant feature requests. This helps get feedback from the community and Bitwarden team members before you start writing code
+  
+* **Report a bug or submit a bugfix:** Use Github issues and pull requests
+  
+* **Write documentation:** Submit a pull request to the [Bitwarden help repository](https://github.com/bitwarden/help)
+  
+* **Help other users:** Go to the [User-to-User Support category](https://community.bitwarden.com/c/support/) on the Community Forums
+  
+* **Translate:** See the localization (i10n) section below
+
+## Contributor Agreement
+
+Please sign the [Contributor Agreement](https://cla-assistant.io/bitwarden/desktop) if you intend on contributing to any Github repository. Pull requests cannot be accepted and merged unless the author has signed the Contributor Agreement.
+
+## Pull Request Guidelines
+
+* use `npm run lint` and fix any linting suggestions before submitting a pull request
+* commit any pull requests against the `master` branch
+* include a link to your Community Forums post
 
 # Localization (l10n)
 

From d8d1ee30229c8223910744d6a1771d1062dcc467 Mon Sep 17 00:00:00 2001
From: Chad Scharf <3904944+cscharf@users.noreply.github.com>
Date: Thu, 29 Oct 2020 16:35:09 -0400
Subject: [PATCH 03/14] Handle main window hide

---
 jslib                                      | 2 +-
 src/app/accounts/lock.component.ts         | 7 +++++--
 src/app/accounts/login.component.ts        | 7 +++++--
 src/app/accounts/register.component.ts     | 7 +++++--
 src/app/accounts/set-password.component.ts | 6 ++++--
 src/app/vault/add-edit.component.ts        | 7 +++++--
 src/app/vault/export.component.ts          | 7 +++++--
 src/main.ts                                | 3 +++
 8 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/jslib b/jslib
index d84d6da7f7..4258077179 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit d84d6da7f77ec89ba69299b1ff982f083fd77203
+Subproject commit 4258077179afa09f57712d2c9d05a9dff0b2f583
diff --git a/src/app/accounts/lock.component.ts b/src/app/accounts/lock.component.ts
index 33b6d5ae80..657c0110ce 100644
--- a/src/app/accounts/lock.component.ts
+++ b/src/app/accounts/lock.component.ts
@@ -17,6 +17,8 @@ import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.service';
 
 import { LockComponent as BaseLockComponent } from 'jslib/angular/components/lock.component';
 
+import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
+
 @Component({
     selector: 'app-lock',
     templateUrl: 'lock.component.html',
@@ -27,9 +29,10 @@ export class LockComponent extends BaseLockComponent {
         userService: UserService, cryptoService: CryptoService,
         storageService: StorageService, vaultTimeoutService: VaultTimeoutService,
         environmentService: EnvironmentService, stateService: StateService,
-        apiService: ApiService, private route: ActivatedRoute) {
+        apiService: ApiService, broadcasterService: BroadcasterService,
+        private route: ActivatedRoute) {
         super(router, i18nService, platformUtilsService, messagingService, userService, cryptoService,
-            storageService, vaultTimeoutService, environmentService, stateService, apiService);
+            storageService, vaultTimeoutService, environmentService, stateService, apiService, broadcasterService);
     }
 
     async ngOnInit() {
diff --git a/src/app/accounts/login.component.ts b/src/app/accounts/login.component.ts
index 1b06d85b5b..8fb75c7afe 100644
--- a/src/app/accounts/login.component.ts
+++ b/src/app/accounts/login.component.ts
@@ -22,6 +22,8 @@ import { SyncService } from 'jslib/abstractions/sync.service';
 import { LoginComponent as BaseLoginComponent } from 'jslib/angular/components/login.component';
 import { ModalComponent } from 'jslib/angular/components/modal.component';
 
+import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
+
 @Component({
     selector: 'app-login',
     templateUrl: 'login.component.html',
@@ -35,9 +37,10 @@ export class LoginComponent extends BaseLoginComponent {
         syncService: SyncService, private componentFactoryResolver: ComponentFactoryResolver,
         platformUtilsService: PlatformUtilsService, stateService: StateService,
         environmentService: EnvironmentService, passwordGenerationService: PasswordGenerationService,
-        cryptoFunctionService: CryptoFunctionService, storageService: StorageService) {
+        cryptoFunctionService: CryptoFunctionService, storageService: StorageService,
+        broadcasterService: BroadcasterService) {
         super(authService, router, platformUtilsService, i18nService, stateService, environmentService,
-            passwordGenerationService, cryptoFunctionService, storageService);
+            passwordGenerationService, cryptoFunctionService, broadcasterService, storageService);
         super.onSuccessfulLogin = () => {
             return syncService.fullSync(true);
         };
diff --git a/src/app/accounts/register.component.ts b/src/app/accounts/register.component.ts
index 19fa0c1962..c6910fe1a7 100644
--- a/src/app/accounts/register.component.ts
+++ b/src/app/accounts/register.component.ts
@@ -9,6 +9,8 @@ import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration
 import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
 import { StateService } from 'jslib/abstractions/state.service';
 
+import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
+
 import { RegisterComponent as BaseRegisterComponent } from 'jslib/angular/components/register.component';
 
 @Component({
@@ -19,8 +21,9 @@ export class RegisterComponent extends BaseRegisterComponent {
     constructor(authService: AuthService, router: Router,
         i18nService: I18nService, cryptoService: CryptoService,
         apiService: ApiService, stateService: StateService,
-        platformUtilsService: PlatformUtilsService, passwordGenerationService: PasswordGenerationService) {
+        platformUtilsService: PlatformUtilsService, passwordGenerationService: PasswordGenerationService,
+        broadcasterService: BroadcasterService) {
         super(authService, router, i18nService, cryptoService, apiService, stateService, platformUtilsService,
-            passwordGenerationService);
+            passwordGenerationService, broadcasterService);
     }
 }
diff --git a/src/app/accounts/set-password.component.ts b/src/app/accounts/set-password.component.ts
index 295ded430f..0e9a9b3e03 100644
--- a/src/app/accounts/set-password.component.ts
+++ b/src/app/accounts/set-password.component.ts
@@ -15,6 +15,8 @@ import { PolicyService } from 'jslib/abstractions/policy.service';
 import { SyncService } from 'jslib/abstractions/sync.service';
 import { UserService } from 'jslib/abstractions/user.service';
 
+import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
+
 import {
     SetPasswordComponent as BaseSetPasswordComponent,
 } from 'jslib/angular/components/set-password.component';
@@ -28,9 +30,9 @@ export class SetPasswordComponent extends BaseSetPasswordComponent {
         cryptoService: CryptoService, messagingService: MessagingService,
         userService: UserService, passwordGenerationService: PasswordGenerationService,
         platformUtilsService: PlatformUtilsService, policyService: PolicyService, router: Router,
-        syncService: SyncService, route: ActivatedRoute) {
+        syncService: SyncService, route: ActivatedRoute, broadcasterService: BroadcasterService) {
         super(i18nService, cryptoService, messagingService, userService, passwordGenerationService,
-            platformUtilsService, policyService, router, apiService, syncService, route);
+            platformUtilsService, policyService, router, apiService, syncService, route, broadcasterService);
     }
 
     get masterPasswordScoreWidth() {
diff --git a/src/app/vault/add-edit.component.ts b/src/app/vault/add-edit.component.ts
index ed0d529d84..937dfbfdaa 100644
--- a/src/app/vault/add-edit.component.ts
+++ b/src/app/vault/add-edit.component.ts
@@ -16,6 +16,8 @@ import { UserService } from 'jslib/abstractions/user.service';
 
 import { AddEditComponent as BaseAddEditComponent } from 'jslib/angular/components/add-edit.component';
 
+import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
+
 @Component({
     selector: 'app-vault-add-edit',
     templateUrl: 'add-edit.component.html',
@@ -25,9 +27,10 @@ export class AddEditComponent extends BaseAddEditComponent implements OnChanges
         i18nService: I18nService, platformUtilsService: PlatformUtilsService,
         auditService: AuditService, stateService: StateService,
         userService: UserService, collectionService: CollectionService,
-        messagingService: MessagingService, eventService: EventService) {
+        messagingService: MessagingService, eventService: EventService,
+        broadcasterService: BroadcasterService) {
         super(cipherService, folderService, i18nService, platformUtilsService, auditService, stateService,
-            userService, collectionService, messagingService, eventService);
+            userService, collectionService, messagingService, eventService, broadcasterService);
     }
 
     async ngOnInit() {
diff --git a/src/app/vault/export.component.ts b/src/app/vault/export.component.ts
index eac41c806e..1fb5d0c70a 100644
--- a/src/app/vault/export.component.ts
+++ b/src/app/vault/export.component.ts
@@ -8,6 +8,8 @@ import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
 
 import { ExportComponent as BaseExportComponent } from 'jslib/angular/components/export.component';
 
+import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
+
 @Component({
     selector: 'app-export',
     templateUrl: 'export.component.html',
@@ -15,7 +17,8 @@ import { ExportComponent as BaseExportComponent } from 'jslib/angular/components
 export class ExportComponent extends BaseExportComponent {
     constructor(cryptoService: CryptoService, i18nService: I18nService,
         platformUtilsService: PlatformUtilsService, exportService: ExportService,
-        eventService: EventService) {
-        super(cryptoService, i18nService, platformUtilsService, exportService, eventService, window);
+        eventService: EventService, broadcasterService: BroadcasterService) {
+        super(cryptoService, i18nService, platformUtilsService, exportService, eventService, window,
+            broadcasterService);
     }
 }
diff --git a/src/main.ts b/src/main.ts
index e582c4cffc..49317e077f 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -149,6 +149,9 @@ export class Main {
                 event.preventDefault();
                 this.processDeepLink([url]);
             });
+
+            // Handle visibility event(s)
+            this.windowMain.win.on('hide', () => this.messagingService.send('hideMain'));
         }, (e: any) => {
             // tslint:disable-next-line
             console.error(e);

From 5ff545e5417bbed7974110086aea149762436969 Mon Sep 17 00:00:00 2001
From: Chad Scharf <3904944+cscharf@users.noreply.github.com>
Date: Mon, 2 Nov 2020 17:08:39 -0500
Subject: [PATCH 04/14] Undo broadcast service refs (not needed)

---
 jslib                               | 2 +-
 src/app/vault/add-edit.component.ts | 7 ++-----
 src/app/vault/export.component.ts   | 7 ++-----
 src/main.ts                         | 3 ---
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/jslib b/jslib
index 4258077179..0e9e73ce95 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 4258077179afa09f57712d2c9d05a9dff0b2f583
+Subproject commit 0e9e73ce95a321ee05edbb62c50f9e1828f69c5a
diff --git a/src/app/vault/add-edit.component.ts b/src/app/vault/add-edit.component.ts
index 937dfbfdaa..ed0d529d84 100644
--- a/src/app/vault/add-edit.component.ts
+++ b/src/app/vault/add-edit.component.ts
@@ -16,8 +16,6 @@ import { UserService } from 'jslib/abstractions/user.service';
 
 import { AddEditComponent as BaseAddEditComponent } from 'jslib/angular/components/add-edit.component';
 
-import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
-
 @Component({
     selector: 'app-vault-add-edit',
     templateUrl: 'add-edit.component.html',
@@ -27,10 +25,9 @@ export class AddEditComponent extends BaseAddEditComponent implements OnChanges
         i18nService: I18nService, platformUtilsService: PlatformUtilsService,
         auditService: AuditService, stateService: StateService,
         userService: UserService, collectionService: CollectionService,
-        messagingService: MessagingService, eventService: EventService,
-        broadcasterService: BroadcasterService) {
+        messagingService: MessagingService, eventService: EventService) {
         super(cipherService, folderService, i18nService, platformUtilsService, auditService, stateService,
-            userService, collectionService, messagingService, eventService, broadcasterService);
+            userService, collectionService, messagingService, eventService);
     }
 
     async ngOnInit() {
diff --git a/src/app/vault/export.component.ts b/src/app/vault/export.component.ts
index 1fb5d0c70a..eac41c806e 100644
--- a/src/app/vault/export.component.ts
+++ b/src/app/vault/export.component.ts
@@ -8,8 +8,6 @@ import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
 
 import { ExportComponent as BaseExportComponent } from 'jslib/angular/components/export.component';
 
-import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
-
 @Component({
     selector: 'app-export',
     templateUrl: 'export.component.html',
@@ -17,8 +15,7 @@ import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
 export class ExportComponent extends BaseExportComponent {
     constructor(cryptoService: CryptoService, i18nService: I18nService,
         platformUtilsService: PlatformUtilsService, exportService: ExportService,
-        eventService: EventService, broadcasterService: BroadcasterService) {
-        super(cryptoService, i18nService, platformUtilsService, exportService, eventService, window,
-            broadcasterService);
+        eventService: EventService) {
+        super(cryptoService, i18nService, platformUtilsService, exportService, eventService, window);
     }
 }
diff --git a/src/main.ts b/src/main.ts
index 49317e077f..e582c4cffc 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -149,9 +149,6 @@ export class Main {
                 event.preventDefault();
                 this.processDeepLink([url]);
             });
-
-            // Handle visibility event(s)
-            this.windowMain.win.on('hide', () => this.messagingService.send('hideMain'));
         }, (e: any) => {
             // tslint:disable-next-line
             console.error(e);

From 4a18a4eb937e7b09c65e44d5aae1548fe1512c02 Mon Sep 17 00:00:00 2001
From: Chad Scharf <3904944+cscharf@users.noreply.github.com>
Date: Mon, 2 Nov 2020 17:11:56 -0500
Subject: [PATCH 05/14] cont. removing broadcast srv jslib refs

---
 src/app/accounts/lock.component.ts         | 7 ++-----
 src/app/accounts/login.component.ts        | 7 ++-----
 src/app/accounts/register.component.ts     | 7 ++-----
 src/app/accounts/set-password.component.ts | 6 ++----
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/src/app/accounts/lock.component.ts b/src/app/accounts/lock.component.ts
index 657c0110ce..33b6d5ae80 100644
--- a/src/app/accounts/lock.component.ts
+++ b/src/app/accounts/lock.component.ts
@@ -17,8 +17,6 @@ import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.service';
 
 import { LockComponent as BaseLockComponent } from 'jslib/angular/components/lock.component';
 
-import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
-
 @Component({
     selector: 'app-lock',
     templateUrl: 'lock.component.html',
@@ -29,10 +27,9 @@ export class LockComponent extends BaseLockComponent {
         userService: UserService, cryptoService: CryptoService,
         storageService: StorageService, vaultTimeoutService: VaultTimeoutService,
         environmentService: EnvironmentService, stateService: StateService,
-        apiService: ApiService, broadcasterService: BroadcasterService,
-        private route: ActivatedRoute) {
+        apiService: ApiService, private route: ActivatedRoute) {
         super(router, i18nService, platformUtilsService, messagingService, userService, cryptoService,
-            storageService, vaultTimeoutService, environmentService, stateService, apiService, broadcasterService);
+            storageService, vaultTimeoutService, environmentService, stateService, apiService);
     }
 
     async ngOnInit() {
diff --git a/src/app/accounts/login.component.ts b/src/app/accounts/login.component.ts
index 8fb75c7afe..1b06d85b5b 100644
--- a/src/app/accounts/login.component.ts
+++ b/src/app/accounts/login.component.ts
@@ -22,8 +22,6 @@ import { SyncService } from 'jslib/abstractions/sync.service';
 import { LoginComponent as BaseLoginComponent } from 'jslib/angular/components/login.component';
 import { ModalComponent } from 'jslib/angular/components/modal.component';
 
-import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
-
 @Component({
     selector: 'app-login',
     templateUrl: 'login.component.html',
@@ -37,10 +35,9 @@ export class LoginComponent extends BaseLoginComponent {
         syncService: SyncService, private componentFactoryResolver: ComponentFactoryResolver,
         platformUtilsService: PlatformUtilsService, stateService: StateService,
         environmentService: EnvironmentService, passwordGenerationService: PasswordGenerationService,
-        cryptoFunctionService: CryptoFunctionService, storageService: StorageService,
-        broadcasterService: BroadcasterService) {
+        cryptoFunctionService: CryptoFunctionService, storageService: StorageService) {
         super(authService, router, platformUtilsService, i18nService, stateService, environmentService,
-            passwordGenerationService, cryptoFunctionService, broadcasterService, storageService);
+            passwordGenerationService, cryptoFunctionService, storageService);
         super.onSuccessfulLogin = () => {
             return syncService.fullSync(true);
         };
diff --git a/src/app/accounts/register.component.ts b/src/app/accounts/register.component.ts
index c6910fe1a7..19fa0c1962 100644
--- a/src/app/accounts/register.component.ts
+++ b/src/app/accounts/register.component.ts
@@ -9,8 +9,6 @@ import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration
 import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
 import { StateService } from 'jslib/abstractions/state.service';
 
-import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
-
 import { RegisterComponent as BaseRegisterComponent } from 'jslib/angular/components/register.component';
 
 @Component({
@@ -21,9 +19,8 @@ export class RegisterComponent extends BaseRegisterComponent {
     constructor(authService: AuthService, router: Router,
         i18nService: I18nService, cryptoService: CryptoService,
         apiService: ApiService, stateService: StateService,
-        platformUtilsService: PlatformUtilsService, passwordGenerationService: PasswordGenerationService,
-        broadcasterService: BroadcasterService) {
+        platformUtilsService: PlatformUtilsService, passwordGenerationService: PasswordGenerationService) {
         super(authService, router, i18nService, cryptoService, apiService, stateService, platformUtilsService,
-            passwordGenerationService, broadcasterService);
+            passwordGenerationService);
     }
 }
diff --git a/src/app/accounts/set-password.component.ts b/src/app/accounts/set-password.component.ts
index 0e9a9b3e03..295ded430f 100644
--- a/src/app/accounts/set-password.component.ts
+++ b/src/app/accounts/set-password.component.ts
@@ -15,8 +15,6 @@ import { PolicyService } from 'jslib/abstractions/policy.service';
 import { SyncService } from 'jslib/abstractions/sync.service';
 import { UserService } from 'jslib/abstractions/user.service';
 
-import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
-
 import {
     SetPasswordComponent as BaseSetPasswordComponent,
 } from 'jslib/angular/components/set-password.component';
@@ -30,9 +28,9 @@ export class SetPasswordComponent extends BaseSetPasswordComponent {
         cryptoService: CryptoService, messagingService: MessagingService,
         userService: UserService, passwordGenerationService: PasswordGenerationService,
         platformUtilsService: PlatformUtilsService, policyService: PolicyService, router: Router,
-        syncService: SyncService, route: ActivatedRoute, broadcasterService: BroadcasterService) {
+        syncService: SyncService, route: ActivatedRoute) {
         super(i18nService, cryptoService, messagingService, userService, passwordGenerationService,
-            platformUtilsService, policyService, router, apiService, syncService, route, broadcasterService);
+            platformUtilsService, policyService, router, apiService, syncService, route);
     }
 
     get masterPasswordScoreWidth() {

From bcc8bc0c800d4c84401264bacc1084b977d6b12d Mon Sep 17 00:00:00 2001
From: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com>
Date: Mon, 2 Nov 2020 16:32:58 -0600
Subject: [PATCH 06/14] [GDPR] Adjusted TOS/Privacy acceptance (#579)

* initial commit gdpr acceptance

* Removed variables/logic now found in superclass

* update jslib (d84d6da -> 5e50aa1)
---
 jslib                                    |  2 +-
 src/app/accounts/register.component.html | 14 +++++++++++++-
 src/locales/en/messages.json             |  6 ++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/jslib b/jslib
index d84d6da7f7..5e50aa1a19 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit d84d6da7f77ec89ba69299b1ff982f083fd77203
+Subproject commit 5e50aa1a195bde11fdc14e9bdf71542766fdbb8d
diff --git a/src/app/accounts/register.component.html b/src/app/accounts/register.component.html
index 6ff8d465cb..b43e4dbe47 100644
--- a/src/app/accounts/register.component.html
+++ b/src/app/accounts/register.component.html
@@ -41,7 +41,7 @@
                 {{'masterPassDesc' | i18n}}
             </div>
         </div>
-        <div class="box last">
+        <div class="box">
             <div class="box-content">
                 <div class="box-content-row box-content-row-flex" appBoxRow>
                     <div class="row-main">
@@ -66,6 +66,18 @@
                 {{'masterPassHintDesc' | i18n}}
             </div>
         </div>
+        <div class="box last" *ngIf="showTerms">
+            <div class="box-footer checkbox">
+                <input type="checkbox" id="acceptPolicies" [(ngModel)]="acceptPolicies" name="AcceptPolicies">
+                <label for="acceptPolicies">
+                    {{'acceptPolicies' | i18n}}<br>
+                    <a href="https://bitwarden.com/terms/" target="_blank"
+                        rel="noopener">{{'termsOfService' | i18n}}</a>,
+                    <a href="https://bitwarden.com/privacy/" target="_blank"
+                        rel="noopener">{{'privacyPolicy' | i18n}}</a>
+                </label>
+            </div>
+        </div>
         <div class="buttons">
             <button type="submit" class="btn primary block" [disabled]="form.loading" appBlurClick>
                 <b [hidden]="form.loading">{{'submit' | i18n}}</b>
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 96f83d645b..ae5684f6d7 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Your new master password does not meet the policy requirements."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }

From 1a918436ca9d598dfb708f210edcfcbfccf90214 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 3 Nov 2020 13:29:00 -0500
Subject: [PATCH 07/14] fix set-env refs

---
 .github/scripts/load-version.ps1            | 2 +-
 .github/scripts/macos/increment-version.ps1 | 2 +-
 .github/workflows/build.yml                 | 7 ++++---
 jslib                                       | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/scripts/load-version.ps1 b/.github/scripts/load-version.ps1
index b8494f7c28..4c0c51933b 100644
--- a/.github/scripts/load-version.ps1
+++ b/.github/scripts/load-version.ps1
@@ -2,4 +2,4 @@
 $packageVersion = (Get-Content -Raw -Path $rootPath\src\package.json | ConvertFrom-Json).version;
 
 Write-Output "Setting package version to $packageVersion";
-Write-Output "::set-env name=PACKAGE_VERSION::$packageVersion";
+Write-Output "PACKAGE_VERSION=$packageVersion" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append;
diff --git a/.github/scripts/macos/increment-version.ps1 b/.github/scripts/macos/increment-version.ps1
index bba3d5ce3f..63787e341e 100644
--- a/.github/scripts/macos/increment-version.ps1
+++ b/.github/scripts/macos/increment-version.ps1
@@ -2,7 +2,7 @@
 $packagePath = "$rootPath\package.json";
 $buildNumber = 100 + [int]$env:GITHUB_RUN_NUMBER;
 Write-Output "Setting build number to $buildNumber";
-Write-Output "::set-env name=BUILD_NUMBER::$buildNumber";
+Write-Output "BUILD_NUMBER=$buildNumber" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append;
 $package = Get-Content -Raw -Path $packagePath | ConvertFrom-Json;
 $package.build | Add-Member -MemberType NoteProperty -Name buildVersion -Value "$buildNumber";
 $package | ConvertTo-Json -Depth 32 | Set-Content $packagePath;
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c3022e422c..bdc91cb20b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,7 +36,7 @@ jobs:
           node-version: '10.x'
 
       - name: Set Node options
-        run: echo "::set-env name=NODE_OPTIONS::--max_old_space_size=4096"
+        run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV
 
       - name: Set up environment
         run: |
@@ -126,7 +126,8 @@ jobs:
           node-version: '10.x'
 
       - name: Set Node options
-        run: echo "::set-env name=NODE_OPTIONS::--max_old_space_size=4096"
+        run: echo "NODE_OPTIONS=--max_old_space_size=4096" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        shell: pwsh
 
       - name: Set up environment
         if: github.event_name == 'release'
@@ -232,7 +233,7 @@ jobs:
           node-version: '10.x'
 
       - name: Set Node options
-        run: echo "::set-env name=NODE_OPTIONS::--max_old_space_size=4096"
+        run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV
 
       - name: Print environment
         run: |
diff --git a/jslib b/jslib
index 5e50aa1a19..0e9e73ce95 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 5e50aa1a195bde11fdc14e9bdf71542766fdbb8d
+Subproject commit 0e9e73ce95a321ee05edbb62c50f9e1828f69c5a

From c001a00f820560084602d1380ebdd189c5f7c28c Mon Sep 17 00:00:00 2001
From: Chad Scharf <3904944+cscharf@users.noreply.github.com>
Date: Wed, 4 Nov 2020 12:09:21 -0500
Subject: [PATCH 08/14] Hide hidden fields on hide/minimize

---
 jslib                                      |  2 +-
 src/app/accounts/lock.component.ts         | 27 ++++++++++++++++--
 src/app/accounts/login.component.ts        | 27 +++++++++++++++++-
 src/app/accounts/register.component.ts     | 33 ++++++++++++++++++++--
 src/app/accounts/set-password.component.ts | 31 ++++++++++++++++++--
 src/app/vault/add-edit.component.ts        | 31 ++++++++++++++++++--
 src/app/vault/export.component.ts          | 33 ++++++++++++++++++++--
 src/app/vault/view.component.ts            | 26 +++++++++++++++++
 src/main.ts                                |  8 ++++++
 9 files changed, 204 insertions(+), 14 deletions(-)

diff --git a/jslib b/jslib
index 0e9e73ce95..1beb30d111 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 0e9e73ce95a321ee05edbb62c50f9e1828f69c5a
+Subproject commit 1beb30d11193bcb2e57fbdb8a147ddcb0c0ddbc2
diff --git a/src/app/accounts/lock.component.ts b/src/app/accounts/lock.component.ts
index 33b6d5ae80..24cc7a1022 100644
--- a/src/app/accounts/lock.component.ts
+++ b/src/app/accounts/lock.component.ts
@@ -1,4 +1,7 @@
-import { Component } from '@angular/core';
+import {
+    Component,
+    NgZone,
+} from '@angular/core';
 import {
     ActivatedRoute,
     Router,
@@ -15,8 +18,12 @@ import { StorageService } from 'jslib/abstractions/storage.service';
 import { UserService } from 'jslib/abstractions/user.service';
 import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.service';
 
+import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
+
 import { LockComponent as BaseLockComponent } from 'jslib/angular/components/lock.component';
 
+const BroadcasterSubscriptionId = 'LockComponent';
+
 @Component({
     selector: 'app-lock',
     templateUrl: 'lock.component.html',
@@ -27,7 +34,8 @@ export class LockComponent extends BaseLockComponent {
         userService: UserService, cryptoService: CryptoService,
         storageService: StorageService, vaultTimeoutService: VaultTimeoutService,
         environmentService: EnvironmentService, stateService: StateService,
-        apiService: ApiService, private route: ActivatedRoute) {
+        apiService: ApiService, private route: ActivatedRoute,
+        private broadcasterService: BroadcasterService, private ngZone: NgZone) {
         super(router, i18nService, platformUtilsService, messagingService, userService, cryptoService,
             storageService, vaultTimeoutService, environmentService, stateService, apiService);
     }
@@ -39,5 +47,20 @@ export class LockComponent extends BaseLockComponent {
                 setTimeout(() => this.unlockBiometric(), 1000);
             }
         });
+        this.broadcasterService.subscribe(BroadcasterSubscriptionId, async (message: any) => {
+            this.ngZone.run(() => {
+                switch (message.command) {
+                    case 'windowHidden':
+                        this.onWindowHidden();
+                        break;
+                
+                    default:
+                }
+            });
+        });
+    }
+
+    onWindowHidden() {
+        this.showPassword = false;
     }
 }
diff --git a/src/app/accounts/login.component.ts b/src/app/accounts/login.component.ts
index 1b06d85b5b..4affb59122 100644
--- a/src/app/accounts/login.component.ts
+++ b/src/app/accounts/login.component.ts
@@ -1,6 +1,7 @@
 import {
     Component,
     ComponentFactoryResolver,
+    NgZone,
     ViewChild,
     ViewContainerRef,
 } from '@angular/core';
@@ -19,9 +20,13 @@ import { StateService } from 'jslib/abstractions/state.service';
 import { StorageService } from 'jslib/abstractions/storage.service';
 import { SyncService } from 'jslib/abstractions/sync.service';
 
+import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
+
 import { LoginComponent as BaseLoginComponent } from 'jslib/angular/components/login.component';
 import { ModalComponent } from 'jslib/angular/components/modal.component';
 
+const BroadcasterSubscriptionId = 'LoginComponent';
+
 @Component({
     selector: 'app-login',
     templateUrl: 'login.component.html',
@@ -35,7 +40,8 @@ export class LoginComponent extends BaseLoginComponent {
         syncService: SyncService, private componentFactoryResolver: ComponentFactoryResolver,
         platformUtilsService: PlatformUtilsService, stateService: StateService,
         environmentService: EnvironmentService, passwordGenerationService: PasswordGenerationService,
-        cryptoFunctionService: CryptoFunctionService, storageService: StorageService) {
+        cryptoFunctionService: CryptoFunctionService, storageService: StorageService,
+        private broadcasterService: BroadcasterService, private ngZone: NgZone) {
         super(authService, router, platformUtilsService, i18nService, stateService, environmentService,
             passwordGenerationService, cryptoFunctionService, storageService);
         super.onSuccessfulLogin = () => {
@@ -43,6 +49,21 @@ export class LoginComponent extends BaseLoginComponent {
         };
     }
 
+    async ngOnInit() {
+        await super.ngOnInit();
+        this.broadcasterService.subscribe(BroadcasterSubscriptionId, async (message: any) => {
+            this.ngZone.run(() => {
+                switch (message.command) {
+                    case 'windowHidden':
+                        this.onWindowHidden();
+                        break;
+                
+                    default:
+                }
+            });
+        });
+    }
+
     settings() {
         const factory = this.componentFactoryResolver.resolveComponentFactory(ModalComponent);
         const modal = this.environmentModal.createComponent(factory).instance;
@@ -61,4 +82,8 @@ export class LoginComponent extends BaseLoginComponent {
             modal.close();
         });
     }
+
+    onWindowHidden() {
+        this.showPassword = false;
+    }
 }
diff --git a/src/app/accounts/register.component.ts b/src/app/accounts/register.component.ts
index 19fa0c1962..ce43790b3b 100644
--- a/src/app/accounts/register.component.ts
+++ b/src/app/accounts/register.component.ts
@@ -1,4 +1,8 @@
-import { Component } from '@angular/core';
+import {
+    Component,
+    OnInit,
+    NgZone,
+} from '@angular/core';
 import { Router } from '@angular/router';
 
 import { ApiService } from 'jslib/abstractions/api.service';
@@ -9,18 +13,41 @@ import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration
 import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
 import { StateService } from 'jslib/abstractions/state.service';
 
+import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
+
 import { RegisterComponent as BaseRegisterComponent } from 'jslib/angular/components/register.component';
 
+const BroadcasterSubscriptionId = 'RegisterComponent';
+
 @Component({
     selector: 'app-register',
     templateUrl: 'register.component.html',
 })
-export class RegisterComponent extends BaseRegisterComponent {
+export class RegisterComponent extends BaseRegisterComponent implements OnInit {
     constructor(authService: AuthService, router: Router,
         i18nService: I18nService, cryptoService: CryptoService,
         apiService: ApiService, stateService: StateService,
-        platformUtilsService: PlatformUtilsService, passwordGenerationService: PasswordGenerationService) {
+        platformUtilsService: PlatformUtilsService, passwordGenerationService: PasswordGenerationService,
+        private broadcasterService: BroadcasterService, private ngZone: NgZone) {
         super(authService, router, i18nService, cryptoService, apiService, stateService, platformUtilsService,
             passwordGenerationService);
     }
+
+    async ngOnInit() {
+        this.broadcasterService.subscribe(BroadcasterSubscriptionId, async (message: any) => {
+            this.ngZone.run(() => {
+                switch (message.command) {
+                    case 'windowHidden':
+                        this.onWindowHidden();
+                        break;
+                
+                    default:
+                }
+            });
+        });
+    }
+
+    onWindowHidden() {
+        this.showPassword = false;
+    }
 }
diff --git a/src/app/accounts/set-password.component.ts b/src/app/accounts/set-password.component.ts
index 295ded430f..b0b0827ca2 100644
--- a/src/app/accounts/set-password.component.ts
+++ b/src/app/accounts/set-password.component.ts
@@ -1,4 +1,7 @@
-import { Component } from '@angular/core';
+import {
+    Component,
+    NgZone,
+} from '@angular/core';
 
 import {
     ActivatedRoute,
@@ -15,6 +18,10 @@ import { PolicyService } from 'jslib/abstractions/policy.service';
 import { SyncService } from 'jslib/abstractions/sync.service';
 import { UserService } from 'jslib/abstractions/user.service';
 
+import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
+
+const BroadcasterSubscriptionId = 'SetPasswordComponent';
+
 import {
     SetPasswordComponent as BaseSetPasswordComponent,
 } from 'jslib/angular/components/set-password.component';
@@ -28,7 +35,8 @@ export class SetPasswordComponent extends BaseSetPasswordComponent {
         cryptoService: CryptoService, messagingService: MessagingService,
         userService: UserService, passwordGenerationService: PasswordGenerationService,
         platformUtilsService: PlatformUtilsService, policyService: PolicyService, router: Router,
-        syncService: SyncService, route: ActivatedRoute) {
+        syncService: SyncService, route: ActivatedRoute,
+        private broadcasterService: BroadcasterService, private ngZone: NgZone) {
         super(i18nService, cryptoService, messagingService, userService, passwordGenerationService,
             platformUtilsService, policyService, router, apiService, syncService, route);
     }
@@ -62,4 +70,23 @@ export class SetPasswordComponent extends BaseSetPasswordComponent {
                 return this.masterPasswordScore != null ? this.i18nService.t('weak') : null;
         }
     }
+
+    async ngOnInit() {
+        await super.ngOnInit();
+        this.broadcasterService.subscribe(BroadcasterSubscriptionId, async (message: any) => {
+            this.ngZone.run(() => {
+                switch (message.command) {
+                    case 'windowHidden':
+                        this.onWindowHidden();
+                        break;
+                
+                    default:
+                }
+            });
+        });
+    }
+
+    onWindowHidden() {
+        this.showPassword = false;
+    }
 }
diff --git a/src/app/vault/add-edit.component.ts b/src/app/vault/add-edit.component.ts
index ed0d529d84..699d155e89 100644
--- a/src/app/vault/add-edit.component.ts
+++ b/src/app/vault/add-edit.component.ts
@@ -1,6 +1,7 @@
 import {
     Component,
     OnChanges,
+    NgZone,
 } from '@angular/core';
 
 import { AuditService } from 'jslib/abstractions/audit.service';
@@ -14,8 +15,12 @@ import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
 import { StateService } from 'jslib/abstractions/state.service';
 import { UserService } from 'jslib/abstractions/user.service';
 
+import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
+
 import { AddEditComponent as BaseAddEditComponent } from 'jslib/angular/components/add-edit.component';
 
+const BroadcasterSubscriptionId = 'AddEditComponent';
+
 @Component({
     selector: 'app-vault-add-edit',
     templateUrl: 'add-edit.component.html',
@@ -25,13 +30,25 @@ export class AddEditComponent extends BaseAddEditComponent implements OnChanges
         i18nService: I18nService, platformUtilsService: PlatformUtilsService,
         auditService: AuditService, stateService: StateService,
         userService: UserService, collectionService: CollectionService,
-        messagingService: MessagingService, eventService: EventService) {
+        messagingService: MessagingService, eventService: EventService,
+        private broadcasterService: BroadcasterService, private ngZone: NgZone) {
         super(cipherService, folderService, i18nService, platformUtilsService, auditService, stateService,
             userService, collectionService, messagingService, eventService);
     }
 
     async ngOnInit() {
-        // We use ngOnChanges instead.
+        this.broadcasterService.subscribe(BroadcasterSubscriptionId, async (message: any) => {
+            this.ngZone.run(() => {
+                switch (message.command) {
+                    case 'windowHidden':
+                        this.onWindowHidden();
+                        break;
+                
+                    default:
+                }
+            });
+        });
+        // We use ngOnChanges for everything else instead.
     }
 
     async ngOnChanges() {
@@ -46,4 +63,14 @@ export class AddEditComponent extends BaseAddEditComponent implements OnChanges
         }
         super.load();
     }
+
+    onWindowHidden() {
+        this.showPassword = false;
+        this.showCardCode = false;
+        if (this.cipher !== null && this.cipher.hasFields) {
+            this.cipher.fields.forEach(field => {
+                field.showValue = false;
+            });
+        }
+    }
 }
diff --git a/src/app/vault/export.component.ts b/src/app/vault/export.component.ts
index eac41c806e..5b43cf7c1c 100644
--- a/src/app/vault/export.component.ts
+++ b/src/app/vault/export.component.ts
@@ -1,4 +1,8 @@
-import { Component } from '@angular/core';
+import {
+    Component,
+    OnInit,
+    NgZone,
+} from '@angular/core';
 
 import { CryptoService } from 'jslib/abstractions/crypto.service';
 import { EventService } from 'jslib/abstractions/event.service';
@@ -6,16 +10,39 @@ import { ExportService } from 'jslib/abstractions/export.service';
 import { I18nService } from 'jslib/abstractions/i18n.service';
 import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
 
+import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
+
 import { ExportComponent as BaseExportComponent } from 'jslib/angular/components/export.component';
 
+const BroadcasterSubscriptionId = 'ExportComponent';
+
 @Component({
     selector: 'app-export',
     templateUrl: 'export.component.html',
 })
-export class ExportComponent extends BaseExportComponent {
+export class ExportComponent extends BaseExportComponent implements OnInit {
     constructor(cryptoService: CryptoService, i18nService: I18nService,
         platformUtilsService: PlatformUtilsService, exportService: ExportService,
-        eventService: EventService) {
+        eventService: EventService, private broadcasterService: BroadcasterService,
+        private ngZone: NgZone) {
         super(cryptoService, i18nService, platformUtilsService, exportService, eventService, window);
     }
+
+    async ngOnInit() {
+        this.broadcasterService.subscribe(BroadcasterSubscriptionId, async (message: any) => {
+            this.ngZone.run(() => {
+                switch (message.command) {
+                    case 'windowHidden':
+                        this.onWindowHidden();
+                        break;
+                
+                    default:
+                }
+            });
+        });
+    }
+
+    onWindowHidden() {
+        this.showPassword = false;
+    }
 }
diff --git a/src/app/vault/view.component.ts b/src/app/vault/view.component.ts
index 60c4c0dba9..73e260110c 100644
--- a/src/app/vault/view.component.ts
+++ b/src/app/vault/view.component.ts
@@ -25,6 +25,8 @@ import { ViewComponent as BaseViewComponent } from 'jslib/angular/components/vie
 
 import { CipherView } from 'jslib/models/view/cipherView';
 
+const BroadcasterSubscriptionId = 'ViewComponent';
+
 @Component({
     selector: 'app-vault-view',
     templateUrl: 'view.component.html',
@@ -42,6 +44,20 @@ export class ViewComponent extends BaseViewComponent implements OnChanges {
         super(cipherService, totpService, tokenService, i18nService, cryptoService, platformUtilsService,
             auditService, window, broadcasterService, ngZone, changeDetectorRef, userService, eventService);
     }
+    ngOnInit() {
+        super.ngOnInit();
+        this.broadcasterService.subscribe(BroadcasterSubscriptionId, (message: any) => {
+            this.ngZone.run(() => {
+                switch (message.command) {
+                    case 'windowHidden':
+                        this.onWindowHidden();
+                        break;
+                
+                    default:
+                }
+            });
+        });
+    }
 
     async ngOnChanges() {
         await super.load();
@@ -56,4 +72,14 @@ export class ViewComponent extends BaseViewComponent implements OnChanges {
         super.copy(value, typeI18nKey, aType);
         this.messagingService.send('minimizeOnCopy');
     }
+
+    onWindowHidden() {
+        this.showPassword = false;
+        this.showCardCode = false;
+        if (this.cipher !== null && this.cipher.hasFields) {
+            this.cipher.fields.forEach(field => {
+                field.showValue = false;
+            });
+        }
+    }
 }
diff --git a/src/main.ts b/src/main.ts
index e582c4cffc..2388577fc8 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -149,6 +149,14 @@ export class Main {
                 event.preventDefault();
                 this.processDeepLink([url]);
             });
+
+            // Handle window visibility events
+            this.windowMain.win.on('hide', () => {
+                this.messagingService.send('windowHidden');
+            });
+            this.windowMain.win.on('minimize', () => {
+                this.messagingService.send('windowHidden');
+            });
         }, (e: any) => {
             // tslint:disable-next-line
             console.error(e);

From fe031ac6b8212ecd01c43c416c3e5dc7db978465 Mon Sep 17 00:00:00 2001
From: Chad Scharf <3904944+cscharf@users.noreply.github.com>
Date: Wed, 4 Nov 2020 12:19:56 -0500
Subject: [PATCH 09/14] remove trailing whitespace for lint errors

---
 src/app/accounts/lock.component.ts         | 1 -
 src/app/accounts/login.component.ts        | 1 -
 src/app/accounts/register.component.ts     | 1 -
 src/app/accounts/set-password.component.ts | 1 -
 src/app/vault/add-edit.component.ts        | 1 -
 src/app/vault/export.component.ts          | 1 -
 src/app/vault/view.component.ts            | 1 -
 7 files changed, 7 deletions(-)

diff --git a/src/app/accounts/lock.component.ts b/src/app/accounts/lock.component.ts
index 24cc7a1022..8603d67bff 100644
--- a/src/app/accounts/lock.component.ts
+++ b/src/app/accounts/lock.component.ts
@@ -53,7 +53,6 @@ export class LockComponent extends BaseLockComponent {
                     case 'windowHidden':
                         this.onWindowHidden();
                         break;
-                
                     default:
                 }
             });
diff --git a/src/app/accounts/login.component.ts b/src/app/accounts/login.component.ts
index 4affb59122..013aba98f8 100644
--- a/src/app/accounts/login.component.ts
+++ b/src/app/accounts/login.component.ts
@@ -57,7 +57,6 @@ export class LoginComponent extends BaseLoginComponent {
                     case 'windowHidden':
                         this.onWindowHidden();
                         break;
-                
                     default:
                 }
             });
diff --git a/src/app/accounts/register.component.ts b/src/app/accounts/register.component.ts
index ce43790b3b..3c7fd8f826 100644
--- a/src/app/accounts/register.component.ts
+++ b/src/app/accounts/register.component.ts
@@ -40,7 +40,6 @@ export class RegisterComponent extends BaseRegisterComponent implements OnInit {
                     case 'windowHidden':
                         this.onWindowHidden();
                         break;
-                
                     default:
                 }
             });
diff --git a/src/app/accounts/set-password.component.ts b/src/app/accounts/set-password.component.ts
index b0b0827ca2..d7e186b090 100644
--- a/src/app/accounts/set-password.component.ts
+++ b/src/app/accounts/set-password.component.ts
@@ -79,7 +79,6 @@ export class SetPasswordComponent extends BaseSetPasswordComponent {
                     case 'windowHidden':
                         this.onWindowHidden();
                         break;
-                
                     default:
                 }
             });
diff --git a/src/app/vault/add-edit.component.ts b/src/app/vault/add-edit.component.ts
index 699d155e89..4571223c0f 100644
--- a/src/app/vault/add-edit.component.ts
+++ b/src/app/vault/add-edit.component.ts
@@ -43,7 +43,6 @@ export class AddEditComponent extends BaseAddEditComponent implements OnChanges
                     case 'windowHidden':
                         this.onWindowHidden();
                         break;
-                
                     default:
                 }
             });
diff --git a/src/app/vault/export.component.ts b/src/app/vault/export.component.ts
index 5b43cf7c1c..0e563e9e01 100644
--- a/src/app/vault/export.component.ts
+++ b/src/app/vault/export.component.ts
@@ -35,7 +35,6 @@ export class ExportComponent extends BaseExportComponent implements OnInit {
                     case 'windowHidden':
                         this.onWindowHidden();
                         break;
-                
                     default:
                 }
             });
diff --git a/src/app/vault/view.component.ts b/src/app/vault/view.component.ts
index 73e260110c..0ba3a5cd07 100644
--- a/src/app/vault/view.component.ts
+++ b/src/app/vault/view.component.ts
@@ -52,7 +52,6 @@ export class ViewComponent extends BaseViewComponent implements OnChanges {
                     case 'windowHidden':
                         this.onWindowHidden();
                         break;
-                
                     default:
                 }
             });

From c9c6a1139056ec5be61be7a238a2f38c3674bf70 Mon Sep 17 00:00:00 2001
From: Chad Scharf <3904944+cscharf@users.noreply.github.com>
Date: Wed, 4 Nov 2020 12:22:17 -0500
Subject: [PATCH 10/14] update jslib

---
 jslib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jslib b/jslib
index 1beb30d111..9aa3cbf73d 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 1beb30d11193bcb2e57fbdb8a147ddcb0c0ddbc2
+Subproject commit 9aa3cbf73d9df9a2641654270911359593bcb5c5

From 97e982bf01dcbb49148d5c0362049b7f60d79c30 Mon Sep 17 00:00:00 2001
From: Chad Scharf <3904944+cscharf@users.noreply.github.com>
Date: Wed, 4 Nov 2020 14:00:44 -0500
Subject: [PATCH 11/14] onDestroy needed for broadcast subscriptions

---
 src/app/accounts/lock.component.ts         | 7 ++++++-
 src/app/accounts/login.component.ts        | 7 ++++++-
 src/app/accounts/register.component.ts     | 7 ++++++-
 src/app/accounts/set-password.component.ts | 7 ++++++-
 src/app/vault/add-edit.component.ts        | 7 ++++++-
 src/app/vault/export.component.ts          | 5 +++++
 src/app/vault/view.component.ts            | 5 +++++
 7 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/src/app/accounts/lock.component.ts b/src/app/accounts/lock.component.ts
index 8603d67bff..d0ebe32eb6 100644
--- a/src/app/accounts/lock.component.ts
+++ b/src/app/accounts/lock.component.ts
@@ -1,5 +1,6 @@
 import {
     Component,
+    OnDestroy,
     NgZone,
 } from '@angular/core';
 import {
@@ -28,7 +29,7 @@ const BroadcasterSubscriptionId = 'LockComponent';
     selector: 'app-lock',
     templateUrl: 'lock.component.html',
 })
-export class LockComponent extends BaseLockComponent {
+export class LockComponent extends BaseLockComponent implements OnDestroy {
     constructor(router: Router, i18nService: I18nService,
         platformUtilsService: PlatformUtilsService, messagingService: MessagingService,
         userService: UserService, cryptoService: CryptoService,
@@ -59,6 +60,10 @@ export class LockComponent extends BaseLockComponent {
         });
     }
 
+    ngOnDestroy() {
+        this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
+    }
+
     onWindowHidden() {
         this.showPassword = false;
     }
diff --git a/src/app/accounts/login.component.ts b/src/app/accounts/login.component.ts
index 013aba98f8..d0d0ba0b13 100644
--- a/src/app/accounts/login.component.ts
+++ b/src/app/accounts/login.component.ts
@@ -1,6 +1,7 @@
 import {
     Component,
     ComponentFactoryResolver,
+    OnDestroy,
     NgZone,
     ViewChild,
     ViewContainerRef,
@@ -31,7 +32,7 @@ const BroadcasterSubscriptionId = 'LoginComponent';
     selector: 'app-login',
     templateUrl: 'login.component.html',
 })
-export class LoginComponent extends BaseLoginComponent {
+export class LoginComponent extends BaseLoginComponent implements OnDestroy {
     @ViewChild('environment', { read: ViewContainerRef, static: true }) environmentModal: ViewContainerRef;
 
     showingModal = false;
@@ -63,6 +64,10 @@ export class LoginComponent extends BaseLoginComponent {
         });
     }
 
+    ngOnDestroy() {
+        this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
+    }
+
     settings() {
         const factory = this.componentFactoryResolver.resolveComponentFactory(ModalComponent);
         const modal = this.environmentModal.createComponent(factory).instance;
diff --git a/src/app/accounts/register.component.ts b/src/app/accounts/register.component.ts
index 3c7fd8f826..c2e26bb916 100644
--- a/src/app/accounts/register.component.ts
+++ b/src/app/accounts/register.component.ts
@@ -1,5 +1,6 @@
 import {
     Component,
+    OnDestroy,
     OnInit,
     NgZone,
 } from '@angular/core';
@@ -23,7 +24,7 @@ const BroadcasterSubscriptionId = 'RegisterComponent';
     selector: 'app-register',
     templateUrl: 'register.component.html',
 })
-export class RegisterComponent extends BaseRegisterComponent implements OnInit {
+export class RegisterComponent extends BaseRegisterComponent implements OnInit, OnDestroy {
     constructor(authService: AuthService, router: Router,
         i18nService: I18nService, cryptoService: CryptoService,
         apiService: ApiService, stateService: StateService,
@@ -46,6 +47,10 @@ export class RegisterComponent extends BaseRegisterComponent implements OnInit {
         });
     }
 
+    ngOnDestroy() {
+        this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
+    }
+
     onWindowHidden() {
         this.showPassword = false;
     }
diff --git a/src/app/accounts/set-password.component.ts b/src/app/accounts/set-password.component.ts
index d7e186b090..b412c5b515 100644
--- a/src/app/accounts/set-password.component.ts
+++ b/src/app/accounts/set-password.component.ts
@@ -1,5 +1,6 @@
 import {
     Component,
+    OnDestroy,
     NgZone,
 } from '@angular/core';
 
@@ -30,7 +31,7 @@ import {
     selector: 'app-set-password',
     templateUrl: 'set-password.component.html',
 })
-export class SetPasswordComponent extends BaseSetPasswordComponent {
+export class SetPasswordComponent extends BaseSetPasswordComponent implements OnDestroy {
     constructor(apiService: ApiService, i18nService: I18nService,
         cryptoService: CryptoService, messagingService: MessagingService,
         userService: UserService, passwordGenerationService: PasswordGenerationService,
@@ -85,6 +86,10 @@ export class SetPasswordComponent extends BaseSetPasswordComponent {
         });
     }
 
+    ngOnDestroy() {
+        this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
+    }
+
     onWindowHidden() {
         this.showPassword = false;
     }
diff --git a/src/app/vault/add-edit.component.ts b/src/app/vault/add-edit.component.ts
index 4571223c0f..2fb79fd7e0 100644
--- a/src/app/vault/add-edit.component.ts
+++ b/src/app/vault/add-edit.component.ts
@@ -1,6 +1,7 @@
 import {
     Component,
     OnChanges,
+    OnDestroy,
     NgZone,
 } from '@angular/core';
 
@@ -25,7 +26,7 @@ const BroadcasterSubscriptionId = 'AddEditComponent';
     selector: 'app-vault-add-edit',
     templateUrl: 'add-edit.component.html',
 })
-export class AddEditComponent extends BaseAddEditComponent implements OnChanges {
+export class AddEditComponent extends BaseAddEditComponent implements OnChanges, OnDestroy {
     constructor(cipherService: CipherService, folderService: FolderService,
         i18nService: I18nService, platformUtilsService: PlatformUtilsService,
         auditService: AuditService, stateService: StateService,
@@ -55,6 +56,10 @@ export class AddEditComponent extends BaseAddEditComponent implements OnChanges
         await this.load();
     }
 
+    ngOnDestroy() {
+        this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
+    }
+
     async load() {
         if (document.querySelectorAll('app-vault-add-edit .ng-dirty').length === 0 ||
             (this.cipher != null && this.cipherId !== this.cipher.id)) {
diff --git a/src/app/vault/export.component.ts b/src/app/vault/export.component.ts
index 0e563e9e01..8d42599f18 100644
--- a/src/app/vault/export.component.ts
+++ b/src/app/vault/export.component.ts
@@ -1,5 +1,6 @@
 import {
     Component,
+    OnDestroy,
     OnInit,
     NgZone,
 } from '@angular/core';
@@ -41,6 +42,10 @@ export class ExportComponent extends BaseExportComponent implements OnInit {
         });
     }
 
+    ngOnDestroy() {
+        this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
+    }
+
     onWindowHidden() {
         this.showPassword = false;
     }
diff --git a/src/app/vault/view.component.ts b/src/app/vault/view.component.ts
index 0ba3a5cd07..f8e411d908 100644
--- a/src/app/vault/view.component.ts
+++ b/src/app/vault/view.component.ts
@@ -58,6 +58,11 @@ export class ViewComponent extends BaseViewComponent implements OnChanges {
         });
     }
 
+    ngOnDestroy() {
+        super.ngOnDestroy();
+        this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
+    }
+
     async ngOnChanges() {
         await super.load();
     }

From 4051e8cfd0c4afa3b24dea81d31f7dbce12766ed Mon Sep 17 00:00:00 2001
From: eliykat <31796059+eliykat@users.noreply.github.com>
Date: Tue, 10 Nov 2020 17:44:04 +1000
Subject: [PATCH 12/14] fix typo

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8b23fe28d2..068a2f5c6a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,7 +16,7 @@ Here is how you can get involved:
   
 * **Help other users:** Go to the [User-to-User Support category](https://community.bitwarden.com/c/support/) on the Community Forums
   
-* **Translate:** See the localization (i10n) section below
+* **Translate:** See the localization (l10n) section below
 
 ## Contributor Agreement
 

From de12fafd03e24590ebcc9ea1f2dd1a1b33300c9f Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kspearrin@users.noreply.github.com>
Date: Tue, 10 Nov 2020 17:19:57 -0500
Subject: [PATCH 13/14] New Crowdin updates (#584)

* New translations messages.json (Romanian)

* New translations messages.json (Thai)

* New translations messages.json (Turkish)

* New translations messages.json (Ukrainian)

* New translations messages.json (Chinese Simplified)

* New translations messages.json (Chinese Traditional)

* New translations messages.json (Vietnamese)

* New translations messages.json (Portuguese, Brazilian)

* New translations messages.json (Indonesian)

* New translations messages.json (Persian)

* New translations messages.json (Croatian)

* New translations messages.json (Serbian (Cyrillic))

* New translations messages.json (Estonian)

* New translations messages.json (Latvian)

* New translations messages.json (English, United Kingdom)

* New translations messages.json (Esperanto)

* New translations messages.json (Malayalam)

* New translations messages.json (Sinhala)

* New translations messages.json (Norwegian Bokmal)

* New translations messages.json (Montenegrin (Latin))

* New translations messages.json (Swedish)

* New translations messages.json (Slovak)

* New translations messages.json (French)

* New translations messages.json (Greek)

* New translations messages.json (Spanish)

* New translations messages.json (Afrikaans)

* New translations messages.json (Belarusian)

* New translations messages.json (Bulgarian)

* New translations messages.json (Catalan)

* New translations messages.json (Czech)

* New translations messages.json (Danish)

* New translations messages.json (German)

* New translations messages.json (Finnish)

* New translations messages.json (Russian)

* New translations messages.json (Hebrew)

* New translations messages.json (Hungarian)

* New translations messages.json (Italian)

* New translations messages.json (Japanese)

* New translations messages.json (Korean)

* New translations messages.json (Dutch)

* New translations messages.json (Polish)

* New translations messages.json (Portuguese)

* New translations messages.json (English, India)
---
 src/locales/af/messages.json    |    6 +
 src/locales/be/messages.json    |   54 +-
 src/locales/bg/messages.json    |    6 +
 src/locales/ca/messages.json    |    6 +
 src/locales/cs/messages.json    |   32 +-
 src/locales/da/messages.json    |    6 +
 src/locales/de/messages.json    |    8 +-
 src/locales/el/messages.json    |    6 +
 src/locales/en_GB/messages.json |    6 +
 src/locales/en_IN/messages.json |    6 +
 src/locales/eo/messages.json    |    6 +
 src/locales/es/messages.json    |   18 +-
 src/locales/et/messages.json    |    6 +
 src/locales/fa/messages.json    |    6 +
 src/locales/fi/messages.json    |    6 +
 src/locales/fr/messages.json    |    6 +
 src/locales/he/messages.json    |   20 +-
 src/locales/hr/messages.json    |    6 +
 src/locales/hu/messages.json    |    6 +
 src/locales/id/messages.json    |    6 +
 src/locales/it/messages.json    |    6 +
 src/locales/ja/messages.json    |    6 +
 src/locales/ko/messages.json    |   18 +-
 src/locales/lv/messages.json    |    6 +
 src/locales/me/messages.json    |    6 +
 src/locales/ml/messages.json    |    6 +
 src/locales/nb/messages.json    |    6 +
 src/locales/nl/messages.json    |    6 +
 src/locales/pl/messages.json    |    6 +
 src/locales/pt_BR/messages.json |    6 +
 src/locales/pt_PT/messages.json |    6 +
 src/locales/ro/messages.json    |   56 +-
 src/locales/ru/messages.json    |    6 +
 src/locales/si/messages.json    |    6 +
 src/locales/sk/messages.json    |    6 +
 src/locales/sr/messages.json    | 1411 +++++++++++++++++++++++++++++++
 src/locales/sv/messages.json    |    6 +
 src/locales/th/messages.json    |    6 +
 src/locales/tr/messages.json    |    6 +
 src/locales/uk/messages.json    |    6 +
 src/locales/vi/messages.json    |    6 +
 src/locales/zh_CN/messages.json |    6 +
 src/locales/zh_TW/messages.json |    6 +
 43 files changed, 1745 insertions(+), 82 deletions(-)
 create mode 100644 src/locales/sr/messages.json

diff --git a/src/locales/af/messages.json b/src/locales/af/messages.json
index 34352a2297..231ee53e52 100644
--- a/src/locales/af/messages.json
+++ b/src/locales/af/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Your new master password does not meet the policy requirements."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/be/messages.json b/src/locales/be/messages.json
index 27bebb8d4d..f53db2017c 100644
--- a/src/locales/be/messages.json
+++ b/src/locales/be/messages.json
@@ -461,19 +461,19 @@
     "message": "Адправіць"
   },
   "masterPass": {
-    "message": "Майстар-пароль"
+    "message": "Асноўны пароль"
   },
   "masterPassDesc": {
-    "message": "Майстар-пароль — ключ да вашага бяспечнага сховішча. Ён вельмі важны, таму не забывайце яго. Аднавіць майстар-пароль немагчыма."
+    "message": "Асноўны пароль — ключ да вашага бяспечнага сховішча. Ён вельмі важны, таму не забывайце яго. Аднавіць асноўны пароль немагчыма."
   },
   "masterPassHintDesc": {
-    "message": "Падказка да майстра-пароля можа дапамагчы вам яго ўспомніць."
+    "message": "Падказка да асноўнага пароля можа дапамагчы вам яго ўспомніць."
   },
   "reTypeMasterPass": {
-    "message": "Увядзіце майстар-пароль паўторна"
+    "message": "Увядзіце асноўны пароль паўторна"
   },
   "masterPassHint": {
-    "message": "Падказка да майстра-пароля (неабавязкова)"
+    "message": "Падказка да асноўнага пароля (неабавязкова)"
   },
   "settings": {
     "message": "Налады"
@@ -482,10 +482,10 @@
     "message": "Падказка да пароля"
   },
   "enterEmailToGetHint": {
-    "message": "Увядзіце адрас электроннай пошты ўліковага запісу для атрымання падказкі для пароля."
+    "message": "Увядзіце адрас электроннай пошты ўліковага запісу для атрымання падказкі для асноўнага пароля."
   },
   "getMasterPasswordHint": {
-    "message": "Атрымаць падказку для майстра-пароля"
+    "message": "Атрымаць падказку для асноўнага пароля"
   },
   "emailRequired": {
     "message": "Патрабуецца адрас электроннай пошты."
@@ -494,19 +494,19 @@
     "message": "Памылковы адрас электроннай пошты."
   },
   "masterPassRequired": {
-    "message": "Патрабуецца майстар-пароль."
+    "message": "Патрабуецца асноўны пароль."
   },
   "masterPassLength": {
-    "message": "Майстар-пароль павінен быць даўжынёй не менш за 8 сімвалаў."
+    "message": "Асноўны пароль павінен быць даўжынёй не менш за 8 сімвалаў."
   },
   "masterPassDoesntMatch": {
-    "message": "Майстры-паролі не супадаюць."
+    "message": "Асноўныя паролі не супадаюць."
   },
   "newAccountCreated": {
     "message": "Ваш уліковы запіс створаны! Вы можаце ўвайсці."
   },
   "masterPassSent": {
-    "message": "Мы адправілі вам на электронную пошту падказку для майстра-пароля."
+    "message": "Мы адправілі вам на электронную пошту падказку для асноўнага пароля."
   },
   "unexpectedError": {
     "message": "Адбылася нечаканая памылка."
@@ -719,10 +719,10 @@
     "message": "Сінхранізаваць сховішча"
   },
   "changeMasterPass": {
-    "message": "Змяніць майстар-пароль"
+    "message": "Змяніць асноўны пароль"
   },
   "changeMasterPasswordConfirmation": {
-    "message": "Вы можаце змяніць свой майстар-пароль на bitwarden.com. Перайсці на сайт зараз?"
+    "message": "Вы можаце змяніць свой асноўны пароль на bitwarden.com. Перайсці на сайт зараз?"
   },
   "fingerprintPhrase": {
     "message": "Фраза адбітка пальца",
@@ -748,7 +748,7 @@
     "message": "Памылка сінхранізацыі"
   },
   "yourVaultIsLocked": {
-    "message": "Ваша сховішча заблакіравана. Каб працягнуць, увядзіце майстар-пароль."
+    "message": "Ваша сховішча заблакіравана. Каб працягнуць, увядзіце асноўны пароль."
   },
   "unlock": {
     "message": "Разблакіраваць"
@@ -767,7 +767,7 @@
     }
   },
   "invalidMasterPassword": {
-    "message": "Памылковы майстар-пароль"
+    "message": "Памылковы асноўны пароль"
   },
   "twoStepLoginConfirmation": {
     "message": "Двухэтапны ўваход робіць ваш уліковы запіс больш бяспечным, патрабуючы пацвярджэння ўваходу на іншай прыладзе, напрыклад, ключом бяспекі, праграмай для праверкі бяспекі, SMS, тэлефонным выклікам або электроннай поштай. Двухэтапны ўваход уключаецца на bitwarden.com. Перайсці на сайт зараз?"
@@ -1186,7 +1186,7 @@
     "message": "Экспартуемы файл утрымлівае даныя вашага сховішча ў незашыфраваным фармаце. Яго не варта захоўваць ці адпраўляць па небяспечным каналам (напрыклад, па электроннай пошце). Выдаліце яго адразу пасля выкарыстання."
   },
   "exportMasterPassword": {
-    "message": "Увядзіце ваш майстар-пароль для экспарту даных са сховішча."
+    "message": "Увядзіце ваш асноўны пароль для экспарту даных са сховішча."
   },
   "noOrganizationsList": {
     "message": "Вы не з'яўляецеся членам якой-небудзь арганізацыі. Арганізацыі дазваляюць бяспечна абменьвацца элементамі з іншымі карыстальнікамі."
@@ -1213,10 +1213,10 @@
     "description": "ex. A weak password. Scale: Weak -> Good -> Strong"
   },
   "weakMasterPassword": {
-    "message": "Слабы майстар-пароль"
+    "message": "Слабы асноўны пароль"
   },
   "weakMasterPasswordDesc": {
-    "message": "Майстар-пароль, выбраны вамі, з'яўляецца слабым. Для належнай абароны ўліковага запісу Bitwarden, вам належыць выкарыстоўваць моцны майстар-пароль (або парольную фразу). Вы ўпэўнены, што хочаце выкарыстоўваць гэты майстар-пароль?"
+    "message": "Асноўны пароль, выбраны вамі, з'яўляецца слабым. Для належнай абароны ўліковага запісу Bitwarden, вы павінны выкарыстоўваць моцны асноўны пароль (або парольную фразу). Вы ўпэўнены, што хочаце выкарыстоўваць гэты асноўны пароль?"
   },
   "pin": {
     "message": "PIN-код",
@@ -1250,7 +1250,7 @@
     "message": "Verify for Bitwarden."
   },
   "lockWithMasterPassOnRestart": {
-    "message": "Блакіраваць майстрам-паролем пры перазапуску"
+    "message": "Блакіраваць асноўным паролем пры перазапуску"
   },
   "preferences": {
     "message": "Налады"
@@ -1349,19 +1349,19 @@
     "message": "Enterprise Single Sign-On"
   },
   "setMasterPassword": {
-    "message": "Set Master Password"
+    "message": "Задаць асноўны пароль"
   },
   "ssoCompleteRegistration": {
     "message": "In order to complete logging in with SSO, please set a master password to access and protect your vault."
   },
   "newMasterPass": {
-    "message": "New Master Password"
+    "message": "Новы асноўны пароль"
   },
   "confirmNewMasterPass": {
-    "message": "Confirm New Master Password"
+    "message": "Пацвердзіць новы асноўны пароль"
   },
   "masterPasswordPolicyInEffect": {
-    "message": "One or more organization policies require your master password to meet the following requirements:"
+    "message": "Згодна з адной або некалькімі палітыкамі арганізацыі неабходна, каб ваш асноўны пароль адказваў наступным патрабаванням:"
   },
   "policyInEffectMinComplexity": {
     "message": "Minimum complexity score of $SCORE$",
@@ -1400,6 +1400,12 @@
     }
   },
   "masterPasswordPolicyRequirementsNotMet": {
-    "message": "Your new master password does not meet the policy requirements."
+    "message": "Ваш новы асноўны пароль не адпавядае патрабаванням палітыкі арганізацыі."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/bg/messages.json b/src/locales/bg/messages.json
index 7709288676..b9a596a049 100644
--- a/src/locales/bg/messages.json
+++ b/src/locales/bg/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Паролата ви не отговаря на политиките."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/ca/messages.json b/src/locales/ca/messages.json
index a04f0c1504..4fb2cd6500 100644
--- a/src/locales/ca/messages.json
+++ b/src/locales/ca/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "La nova contrasenya principal no compleix els requisits de la política."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/cs/messages.json b/src/locales/cs/messages.json
index a62570bff8..825401f58a 100644
--- a/src/locales/cs/messages.json
+++ b/src/locales/cs/messages.json
@@ -1346,25 +1346,25 @@
     "message": "Potvrzení akce při vypršení časového limitu"
   },
   "enterpriseSingleSignOn": {
-    "message": "Enterprise Single Sign-On"
+    "message": "Jednotné podnikové přihlášení"
   },
   "setMasterPassword": {
-    "message": "Set Master Password"
+    "message": "Nastavení hlavního hesla"
   },
   "ssoCompleteRegistration": {
-    "message": "In order to complete logging in with SSO, please set a master password to access and protect your vault."
+    "message": "Chcete-li dokončit přihlášení pomocí SSO, nastavte prosím hlavní heslo pro přístup a ochranu vašeho trezoru."
   },
   "newMasterPass": {
-    "message": "New Master Password"
+    "message": "Nové hlavní heslo"
   },
   "confirmNewMasterPass": {
-    "message": "Confirm New Master Password"
+    "message": "Potvrďte nové heslo"
   },
   "masterPasswordPolicyInEffect": {
-    "message": "One or more organization policies require your master password to meet the following requirements:"
+    "message": "Jedna nebo více zásad organizace vyžaduje, aby hlavní heslo splňovalo následující požadavky:"
   },
   "policyInEffectMinComplexity": {
-    "message": "Minimum complexity score of $SCORE$",
+    "message": "Minimální skóre složitosti $SCORE$",
     "placeholders": {
       "score": {
         "content": "$1",
@@ -1373,7 +1373,7 @@
     }
   },
   "policyInEffectMinLength": {
-    "message": "Minimum length of $LENGTH$",
+    "message": "Minimální délka $LENGTH$",
     "placeholders": {
       "length": {
         "content": "$1",
@@ -1382,16 +1382,16 @@
     }
   },
   "policyInEffectUppercase": {
-    "message": "Contain one or more uppercase characters"
+    "message": "Obsahuje jedno nebo více velkých písmen"
   },
   "policyInEffectLowercase": {
-    "message": "Contain one or more lowercase characters"
+    "message": "Obsahuje jedno nebo více malých písmen"
   },
   "policyInEffectNumbers": {
-    "message": "Contain one or more numbers"
+    "message": "Obsahuje jednu nebo více číslic"
   },
   "policyInEffectSpecial": {
-    "message": "Contain one or more of the following special characters $CHARS$",
+    "message": "Obsahuje jeden nebo více následujících speciálních znaků: $CHARS$",
     "placeholders": {
       "chars": {
         "content": "$1",
@@ -1400,6 +1400,12 @@
     }
   },
   "masterPasswordPolicyRequirementsNotMet": {
-    "message": "Your new master password does not meet the policy requirements."
+    "message": "Vaše nové hlavní heslo nesplňuje požadavky zásad."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/da/messages.json b/src/locales/da/messages.json
index a1f9dc9fb6..a7de8b88d2 100644
--- a/src/locales/da/messages.json
+++ b/src/locales/da/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Din nye hovedadgangskode opfylder ikke politikkravene."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/de/messages.json b/src/locales/de/messages.json
index 6e360d76b0..eece04a41d 100644
--- a/src/locales/de/messages.json
+++ b/src/locales/de/messages.json
@@ -343,7 +343,7 @@
     "message": "Soll dieser Eintrag wirklich gelöscht werden?"
   },
   "deletedItem": {
-    "message": "Eintrag gelöscht"
+    "message": "Eintrag in Papierkorb verschoben"
   },
   "overwritePasswordConfirmation": {
     "message": "Bist du sicher, dass du das Passwort überschreiben möchtest?"
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Ihr neues Masterpasswort entspricht nicht den Anforderungen der Richtlinie."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/el/messages.json b/src/locales/el/messages.json
index f79ae18446..0bf79f1aa6 100644
--- a/src/locales/el/messages.json
+++ b/src/locales/el/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Your new master password does not meet the policy requirements."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/en_GB/messages.json b/src/locales/en_GB/messages.json
index 25f50c09fa..db051b3cef 100644
--- a/src/locales/en_GB/messages.json
+++ b/src/locales/en_GB/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Your new master password does not meet the policy requirements."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/en_IN/messages.json b/src/locales/en_IN/messages.json
index 25f50c09fa..db051b3cef 100644
--- a/src/locales/en_IN/messages.json
+++ b/src/locales/en_IN/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Your new master password does not meet the policy requirements."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/eo/messages.json b/src/locales/eo/messages.json
index b5e8aea957..1e73b702f9 100644
--- a/src/locales/eo/messages.json
+++ b/src/locales/eo/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Your new master password does not meet the policy requirements."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/es/messages.json b/src/locales/es/messages.json
index 95398ad0f8..82a2c7eea9 100644
--- a/src/locales/es/messages.json
+++ b/src/locales/es/messages.json
@@ -776,10 +776,10 @@
     "message": "Autenticación en dos pasos"
   },
   "vaultTimeout": {
-    "message": "Tiempo de espera de la bóveda"
+    "message": "Tiempo de espera de la caja fuerte"
   },
   "vaultTimeoutDesc": {
-    "message": "Elija cuando se agotará el tiempo de espera de su bóveda y se ejecutará la acción seleccionada."
+    "message": "Elije cuando se agotará el tiempo de espera de tu caja fuerte y se ejecutará la acción seleccionada."
   },
   "immediately": {
     "message": "Inmediatamente"
@@ -975,7 +975,7 @@
     "message": "Métodos de autenticación en dos pasos adicionales como YubiKey, FIDO U2F y Duo."
   },
   "premiumSignUpReports": {
-    "message": "Higiene de contraseña, salud de la cuenta e informes de violaciones de datos para mantener su caja fuerte segura."
+    "message": "Higiene de contraseña, salud de la cuenta e informes de violaciones de datos para mantener tu caja fuerte segura."
   },
   "premiumSignUpTotp": {
     "message": "Generación de códigos TOTP (2FA) para registros de tu caja fuerte."
@@ -1302,10 +1302,10 @@
     "message": "Tiempo de espera de la caja fuerte"
   },
   "vaultTimeoutActionLockDesc": {
-    "message": "Una bóveda bloqueada requiere que introduzcas de nuevo tu contraseña maestra para acceder nuevamente."
+    "message": "Una caja fuerte bloqueada requiere que introduzcas de nuevo tu contraseña maestra para acceder nuevamente."
   },
   "vaultTimeoutActionLogOutDesc": {
-    "message": "Cerrar sesión en la bóveda requiere que vuelvas a autenticarte para acceder nuevamente a ella."
+    "message": "Cerrar sesión en la caja fuerte requiere que vuelvas a autenticarte para acceder nuevamente a ella."
   },
   "lock": {
     "message": "Bloquear",
@@ -1340,7 +1340,7 @@
     "message": "Eliminar de forma permanente"
   },
   "vaultTimeoutLogOutConfirmation": {
-    "message": "Cerrar sesión eliminará todo el acceso a su bóveda y requiere autenticación en línea después del período de espera. ¿Estás seguro de que quieres usar esta configuración?"
+    "message": "Si cierras sesión, tu caja fuerte se bloqueará después del tiempo de espera seleccionado hasta que vuelvas a autenticarte. Utiliza esta opción sólo si este es el efecto deseado."
   },
   "vaultTimeoutLogOutConfirmationTitle": {
     "message": "Confirmación de acción del tiempo de espera de la caja fuerte"
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Su nueva contraseña maestra no cumple con los requisitos de la política."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/et/messages.json b/src/locales/et/messages.json
index 2d9dc2f449..56c557b41d 100644
--- a/src/locales/et/messages.json
+++ b/src/locales/et/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Uus ülemparool ei vasta eeskirjades väljatoodud tingimustele."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/fa/messages.json b/src/locales/fa/messages.json
index 99d26f45ea..ec4a630e76 100644
--- a/src/locales/fa/messages.json
+++ b/src/locales/fa/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "کلمه عبور اصلی جدید شما از شرایط سیاست پپیروی نمی کند."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/fi/messages.json b/src/locales/fi/messages.json
index ec51cba44a..507bf302d8 100644
--- a/src/locales/fi/messages.json
+++ b/src/locales/fi/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Uusi pääsalasanasi ei täytä käytäntövaatimuksia."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/fr/messages.json b/src/locales/fr/messages.json
index 294f6cb8bb..ef4bfa7bb0 100644
--- a/src/locales/fr/messages.json
+++ b/src/locales/fr/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Votre nouveau mot de passe maître ne répond pas aux exigences de la politique."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/he/messages.json b/src/locales/he/messages.json
index 9435b9f98a..e3dabd5ff1 100644
--- a/src/locales/he/messages.json
+++ b/src/locales/he/messages.json
@@ -1238,7 +1238,7 @@
     "message": "הכספת שלך נעולה. הזן את קוד הPIN שלך כדי להמשיך."
   },
   "unlockWithWindowsHello": {
-    "message": "שחרור הנעילה עם Windows Hello"
+    "message": "שחרור נעילה עם Windows Hello"
   },
   "windowsHelloConsentMessage": {
     "message": "אימות עבור Bitwarden."
@@ -1364,7 +1364,7 @@
     "message": "אחד או יותר מאילוצי המדיניות של הארגון דורשים שהסיסמה הראשית שלך תעמוד בדרישות הבאות:"
   },
   "policyInEffectMinComplexity": {
-    "message": "ניקוד מורכבות מזערי של $SCORE$",
+    "message": "ניקוד מורכבות הסיסמה צריך להיות לפחות {0}",
     "placeholders": {
       "score": {
         "content": "$1",
@@ -1373,7 +1373,7 @@
     }
   },
   "policyInEffectMinLength": {
-    "message": "אורך מזערי של $LENGTH$",
+    "message": "אורך מינימלי של $LENGTH$",
     "placeholders": {
       "length": {
         "content": "$1",
@@ -1382,16 +1382,16 @@
     }
   },
   "policyInEffectUppercase": {
-    "message": "תכיל אות גדולה אחת או יותר"
+    "message": "מכילה אות גדולה אחת או יותר"
   },
   "policyInEffectLowercase": {
-    "message": "תכיל אות קטנה אחת או יותר"
+    "message": "מכילה אות קטנה אחת או יותר"
   },
   "policyInEffectNumbers": {
-    "message": "תכיל ספרה אחת או יותר"
+    "message": "מכילה ספרה אחת או יותר"
   },
   "policyInEffectSpecial": {
-    "message": "תכיל תו מיוחד אחד או יותר מבין התווים האלו $CHARS$",
+    "message": "מכילה תו אחד או יותר מהתווים הבאים: {0}",
     "placeholders": {
       "chars": {
         "content": "$1",
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "הסיסמה הראשית החדשה השלך לא עומדת בדרישות המדיניות."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/hr/messages.json b/src/locales/hr/messages.json
index 9b3af73e62..a3eef82efd 100644
--- a/src/locales/hr/messages.json
+++ b/src/locales/hr/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Your new master password does not meet the policy requirements."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/hu/messages.json b/src/locales/hu/messages.json
index cf3315eae7..62fe4e38dd 100644
--- a/src/locales/hu/messages.json
+++ b/src/locales/hu/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Az új mesterjelszó nem felel meg a szabály követelményeknek."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/id/messages.json b/src/locales/id/messages.json
index bb6dccdbf8..e0a0576a27 100644
--- a/src/locales/id/messages.json
+++ b/src/locales/id/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Kata sandi utama Anda yang baru tidak memenuhi persyaratan kebijakan."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/it/messages.json b/src/locales/it/messages.json
index aec9a54129..10a7b8972d 100644
--- a/src/locales/it/messages.json
+++ b/src/locales/it/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "La tua nuova password principale non soddisfa i requisiti di sicurezza."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/ja/messages.json b/src/locales/ja/messages.json
index 660c867b7a..3599259e41 100644
--- a/src/locales/ja/messages.json
+++ b/src/locales/ja/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "新しいマスターパスワードは最低要件を満たしていません。"
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/ko/messages.json b/src/locales/ko/messages.json
index 6a103e191c..bf0a70dfcc 100644
--- a/src/locales/ko/messages.json
+++ b/src/locales/ko/messages.json
@@ -1241,13 +1241,13 @@
     "message": "Windows Hello를 사용하여 잠금 해제"
   },
   "windowsHelloConsentMessage": {
-    "message": "Verify for Bitwarden."
+    "message": "Bitwarden에서 인증을 요청합니다."
   },
   "unlockWithTouchId": {
     "message": "Touch ID를 사용하여 잠금 해제"
   },
   "touchIdConsentMessage": {
-    "message": "Verify for Bitwarden."
+    "message": "Bitwarden에서 인증을 요청합니다."
   },
   "lockWithMasterPassOnRestart": {
     "message": "다시 시작 시 마스터 비밀번호로 잠금"
@@ -1346,13 +1346,13 @@
     "message": "시간 제한 초과시 동작 확인"
   },
   "enterpriseSingleSignOn": {
-    "message": "Enterprise Single Sign-On"
+    "message": "엔터프라이즈 통합 인증 (SSO)"
   },
   "setMasterPassword": {
     "message": "마스터 비밀번호 설정"
   },
   "ssoCompleteRegistration": {
-    "message": "In order to complete logging in with SSO, please set a master password to access and protect your vault."
+    "message": "SSO 로그인을 하기 위해서 보관함에 접근하고 보호할 수 있도록 마스터 비밀번호를 설정해주세요."
   },
   "newMasterPass": {
     "message": "새 마스터 비밀번호"
@@ -1373,7 +1373,7 @@
     }
   },
   "policyInEffectMinLength": {
-    "message": "Minimum length of $LENGTH$",
+    "message": "최소 길이 $LENGTH$",
     "placeholders": {
       "length": {
         "content": "$1",
@@ -1391,7 +1391,7 @@
     "message": "하나 이상의 숫자 포함"
   },
   "policyInEffectSpecial": {
-    "message": "Contain one or more of the following special characters $CHARS$",
+    "message": "하나 이상의 다음 특수문자 포함 $CHARS$",
     "placeholders": {
       "chars": {
         "content": "$1",
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "새 마스터 비밀번호가 정책 요구 사항을 따르지 않습니다."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/lv/messages.json b/src/locales/lv/messages.json
index b5e8aea957..1e73b702f9 100644
--- a/src/locales/lv/messages.json
+++ b/src/locales/lv/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Your new master password does not meet the policy requirements."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/me/messages.json b/src/locales/me/messages.json
index a278c25d14..f170c9a090 100644
--- a/src/locales/me/messages.json
+++ b/src/locales/me/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Your new master password does not meet the policy requirements."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/ml/messages.json b/src/locales/ml/messages.json
index 0a200b54fa..d13f5dcf58 100644
--- a/src/locales/ml/messages.json
+++ b/src/locales/ml/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "നിങ്ങളുടെ പുതിയ മാസ്റ്റർ പാസ്‌വേഡ് നയ ആവശ്യകതകൾ നിറവേറ്റുന്നില്ല."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/nb/messages.json b/src/locales/nb/messages.json
index 74a999d39d..1661c62fee 100644
--- a/src/locales/nb/messages.json
+++ b/src/locales/nb/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Your new master password does not meet the policy requirements."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/nl/messages.json b/src/locales/nl/messages.json
index 7c811731ca..cc9cbf4e04 100644
--- a/src/locales/nl/messages.json
+++ b/src/locales/nl/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Je nieuwe hoofdwachtwoord voldoet niet aan de beleidseisen."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/pl/messages.json b/src/locales/pl/messages.json
index d12a9475ac..dd2413bda9 100644
--- a/src/locales/pl/messages.json
+++ b/src/locales/pl/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Nowe hasło główne nie spełnia wymaganych zasad."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/pt_BR/messages.json b/src/locales/pt_BR/messages.json
index 3eb106e39f..4b2b8a0f37 100644
--- a/src/locales/pt_BR/messages.json
+++ b/src/locales/pt_BR/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "A sua nova senha mestra não cumpre aos requisitos da política."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/pt_PT/messages.json b/src/locales/pt_PT/messages.json
index 8ebca2d534..3b40ed7d79 100644
--- a/src/locales/pt_PT/messages.json
+++ b/src/locales/pt_PT/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "A sua nova palavra-passe mestra não cumpre os requisitos da política."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/ro/messages.json b/src/locales/ro/messages.json
index 9609f2c566..f275054c09 100644
--- a/src/locales/ro/messages.json
+++ b/src/locales/ro/messages.json
@@ -3,7 +3,7 @@
     "message": "Bitwarden"
   },
   "filters": {
-    "message": "Filters"
+    "message": "Filtre"
   },
   "allItems": {
     "message": "Toate elementele"
@@ -85,7 +85,7 @@
     "message": "Parolă"
   },
   "passphrase": {
-    "message": "Passphrase"
+    "message": "Frază de acces"
   },
   "editItem": {
     "message": "Editare articol"
@@ -113,10 +113,10 @@
     "description": "Copy value to clipboard"
   },
   "minimizeOnCopyToClipboard": {
-    "message": "Minimize when copying to clipboard"
+    "message": "Minimizați când copiați în clipboard"
   },
   "minimizeOnCopyToClipboardDesc": {
-    "message": "Minimize when copying an item's data to the clipboard."
+    "message": "Minimizați când copiați datele unui articol în clipboard."
   },
   "toggleVisibility": {
     "message": "Comutare vizibilitate"
@@ -377,11 +377,11 @@
     "message": "Word Separator"
   },
   "capitalize": {
-    "message": "Capitalize",
+    "message": "Majuscule inițiale",
     "description": "Make the first letter of a work uppercase."
   },
   "includeNumber": {
-    "message": "Include Number"
+    "message": "Include cifre"
   },
   "close": {
     "message": "Închidere"
@@ -776,7 +776,7 @@
     "message": "Autentificare în două etape"
   },
   "vaultTimeout": {
-    "message": "Vault Timeout"
+    "message": "Expirarea seifului"
   },
   "vaultTimeoutDesc": {
     "message": "Choose when your vault will timeout and perform the selected action."
@@ -1165,7 +1165,7 @@
     "description": "Application window should always stay on top of other windows"
   },
   "dateUpdated": {
-    "message": "Updated",
+    "message": "Actualizat",
     "description": "ex. Date this item was updated"
   },
   "datePasswordUpdated": {
@@ -1179,14 +1179,14 @@
     "message": "File Format"
   },
   "warning": {
-    "message": "WARNING",
+    "message": "AVERTISMENT",
     "description": "WARNING (should stay in capitalized letters if the language permits)"
   },
   "exportWarningDesc": {
     "message": "This export contains your vault data in an unencrypted format. You should not store or send the exported file over unsecure channels (such as email). Delete it immediately after you are done using it."
   },
   "exportMasterPassword": {
-    "message": "Enter your master password to export your vault data."
+    "message": "Introduceți parola principală pentru a exporta datele din seif."
   },
   "noOrganizationsList": {
     "message": "You do not belong to any organizations. Organizations allow you to securely share items with other users."
@@ -1201,29 +1201,29 @@
     "message": "Who owns this item?"
   },
   "strong": {
-    "message": "Strong",
+    "message": "Puternic",
     "description": "ex. A strong password. Scale: Weak -> Good -> Strong"
   },
   "good": {
-    "message": "Good",
+    "message": "Bun",
     "description": "ex. A good password. Scale: Weak -> Good -> Strong"
   },
   "weak": {
-    "message": "Weak",
+    "message": "Slab",
     "description": "ex. A weak password. Scale: Weak -> Good -> Strong"
   },
   "weakMasterPassword": {
     "message": "Weak Master Password"
   },
   "weakMasterPasswordDesc": {
-    "message": "The master password you have chosen is weak. You should use a strong master password (or a passphrase) to properly protect your Bitwarden account. Are you sure you want to use this master password?"
+    "message": "Parola principală aleasă este slabă. Ar trebui folosită o parolă principală (sau o frază de access) puternică pentru a vă proteja corect contul Bitwarden. Sunteți sigur că doriți să folosiți această parola principală?"
   },
   "pin": {
     "message": "PIN",
     "description": "PIN code. Ex. The short code (often numeric) that you use to unlock a device."
   },
   "unlockWithPin": {
-    "message": "Unlock with PIN"
+    "message": "Deblocați cu codul PIN"
   },
   "setYourPinCode": {
     "message": "Set your PIN code for unlocking Bitwarden. Your PIN settings will be reset if you ever fully log out of the application."
@@ -1232,7 +1232,7 @@
     "message": "PIN code is required."
   },
   "invalidPin": {
-    "message": "Invalid PIN code."
+    "message": "Cod PIN invalid."
   },
   "yourVaultIsLockedPinCode": {
     "message": "Your vault is locked. Verify your PIN code to continue."
@@ -1253,7 +1253,7 @@
     "message": "Lock with master password on restart"
   },
   "preferences": {
-    "message": "Preferences"
+    "message": "Preferințe"
   },
   "enableMenuBar": {
     "message": "Enable Menu Bar Icon"
@@ -1262,7 +1262,7 @@
     "message": "Always show an icon in the menu bar."
   },
   "hideToMenuBar": {
-    "message": "Hide to Menu Bar"
+    "message": "Ascunde în bara de meniu"
   },
   "selectOneCollection": {
     "message": "You must select at least one collection."
@@ -1271,7 +1271,7 @@
     "message": "You've upgraded to premium."
   },
   "restore": {
-    "message": "Restore"
+    "message": "Restaurați"
   },
   "premiumManageAlertAppStore": {
     "message": "You can manage your subscription from the App Store. Do you want to visit the App Store now?"
@@ -1281,25 +1281,25 @@
     "description": "Noun. As in 'legal documents', like our terms of service and privacy policy."
   },
   "termsOfService": {
-    "message": "Terms of Service"
+    "message": "Termenii Serviciului"
   },
   "privacyPolicy": {
-    "message": "Privacy Policy"
+    "message": "Politica Intimității"
   },
   "unsavedChangesConfirmation": {
     "message": "Are you sure you want to leave? If you leave now then your current information will not be saved."
   },
   "unsavedChangesTitle": {
-    "message": "Unsaved Changes"
+    "message": "Modificări nesalvate"
   },
   "clone": {
-    "message": "Clone"
+    "message": "Clonare"
   },
   "passwordGeneratorPolicyInEffect": {
     "message": "One or more organization policies are affecting your generator settings."
   },
   "vaultTimeoutAction": {
-    "message": "Vault Timeout Action"
+    "message": "Acțiune la expirarea seifului"
   },
   "vaultTimeoutActionLockDesc": {
     "message": "A locked vault requires that you re-enter your master password to access it again."
@@ -1308,7 +1308,7 @@
     "message": "A logged out vault requires that you re-authenticate to access it again."
   },
   "lock": {
-    "message": "Lock",
+    "message": "Blocare",
     "description": "Verb form: to make secure or inaccesible by"
   },
   "trash": {
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Your new master password does not meet the policy requirements."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/ru/messages.json b/src/locales/ru/messages.json
index 47203856da..173e9da610 100644
--- a/src/locales/ru/messages.json
+++ b/src/locales/ru/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Ваш новый мастер-пароль не соответствует требованиям политики."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/si/messages.json b/src/locales/si/messages.json
index f8271b1884..3132917e4f 100644
--- a/src/locales/si/messages.json
+++ b/src/locales/si/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Your new master password does not meet the policy requirements."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/sk/messages.json b/src/locales/sk/messages.json
index c29141c057..29d91e7a41 100644
--- a/src/locales/sk/messages.json
+++ b/src/locales/sk/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Vaše nové hlavné heslo nespĺňa pravidlá."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/sr/messages.json b/src/locales/sr/messages.json
new file mode 100644
index 0000000000..bec0cfe1c5
--- /dev/null
+++ b/src/locales/sr/messages.json
@@ -0,0 +1,1411 @@
+{
+  "bitwarden": {
+    "message": "Bitwarden"
+  },
+  "filters": {
+    "message": "Филтери"
+  },
+  "allItems": {
+    "message": "Све ставке"
+  },
+  "favorites": {
+    "message": "Омиљени"
+  },
+  "types": {
+    "message": "Врсте"
+  },
+  "typeLogin": {
+    "message": "Пријава"
+  },
+  "typeCard": {
+    "message": "Картица"
+  },
+  "typeIdentity": {
+    "message": "Идентитет"
+  },
+  "typeSecureNote": {
+    "message": "Сигурносна белешка"
+  },
+  "folders": {
+    "message": "Фасцикле"
+  },
+  "collections": {
+    "message": "Колекције"
+  },
+  "searchVault": {
+    "message": "Претраћи Сеф"
+  },
+  "addItem": {
+    "message": "Додај ставку"
+  },
+  "shared": {
+    "message": "Дељено"
+  },
+  "share": {
+    "message": "Подели"
+  },
+  "shareItem": {
+    "message": "Поделити ставку"
+  },
+  "sharedItem": {
+    "message": "Ставка дељена"
+  },
+  "shareDesc": {
+    "message": "Choose an organization that you wish to share this item with. Sharing transfers ownership of the item to the organization. You will no longer be the direct owner of this item once it has been shared."
+  },
+  "attachments": {
+    "message": "Прилози"
+  },
+  "viewItem": {
+    "message": "Види ставку"
+  },
+  "name": {
+    "message": "Име"
+  },
+  "uri": {
+    "message": "УРЛ"
+  },
+  "uriPosition": {
+    "message": "УРЛ $POSITION$",
+    "description": "A listing of URIs. Ex: URI 1, URI 2, URI 3, etc.",
+    "placeholders": {
+      "position": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "newUri": {
+    "message": "Нови УРЛ"
+  },
+  "username": {
+    "message": "Корисничко име"
+  },
+  "password": {
+    "message": "Лозинка"
+  },
+  "passphrase": {
+    "message": "Реченица"
+  },
+  "editItem": {
+    "message": "Уреди ставку"
+  },
+  "emailAddress": {
+    "message": "Имејл"
+  },
+  "verificationCodeTotp": {
+    "message": "Верификациони код (TOTP)"
+  },
+  "website": {
+    "message": "Веб сајт"
+  },
+  "notes": {
+    "message": "Белешке"
+  },
+  "customFields": {
+    "message": "Прилагођена Поља"
+  },
+  "launch": {
+    "message": "Покрени"
+  },
+  "copyValue": {
+    "message": "Копирај вредност",
+    "description": "Copy value to clipboard"
+  },
+  "minimizeOnCopyToClipboard": {
+    "message": "Минимизирај приликом копирања у клипборду"
+  },
+  "minimizeOnCopyToClipboardDesc": {
+    "message": "Минимизирај приликом копирања ставке у клипборду."
+  },
+  "toggleVisibility": {
+    "message": "Пребаци видљивост"
+  },
+  "toggleCollapse": {
+    "message": "Пребаци проширење",
+    "description": "Toggling an expand/collapse state."
+  },
+  "cardholderName": {
+    "message": "Име Власника Картице"
+  },
+  "number": {
+    "message": "Број"
+  },
+  "brand": {
+    "message": "Произвођач"
+  },
+  "expiration": {
+    "message": "Истек"
+  },
+  "securityCode": {
+    "message": "Сигурносни код"
+  },
+  "identityName": {
+    "message": "Име идентитета"
+  },
+  "company": {
+    "message": "Предузеће"
+  },
+  "ssn": {
+    "message": "Број социјалног осигурања"
+  },
+  "passportNumber": {
+    "message": "Број пасоша"
+  },
+  "licenseNumber": {
+    "message": "Број возачке дозволе"
+  },
+  "email": {
+    "message": "Имејл"
+  },
+  "phone": {
+    "message": "Телефон"
+  },
+  "address": {
+    "message": "Адреса"
+  },
+  "premiumRequired": {
+    "message": "Потребан Премијум"
+  },
+  "premiumRequiredDesc": {
+    "message": "Премијум је потребно за употребу ове способности."
+  },
+  "errorOccurred": {
+    "message": "Појавила се грешка."
+  },
+  "error": {
+    "message": "Грешка"
+  },
+  "january": {
+    "message": "Јануар"
+  },
+  "february": {
+    "message": "Фебруар"
+  },
+  "march": {
+    "message": "Mart"
+  },
+  "april": {
+    "message": "Април"
+  },
+  "may": {
+    "message": "Мај"
+  },
+  "june": {
+    "message": "Јун"
+  },
+  "july": {
+    "message": "Јул"
+  },
+  "august": {
+    "message": "Август"
+  },
+  "september": {
+    "message": "Септембар"
+  },
+  "october": {
+    "message": "Октобар"
+  },
+  "november": {
+    "message": "Новембар"
+  },
+  "december": {
+    "message": "Децембар"
+  },
+  "ex": {
+    "message": "нпр.",
+    "description": "Short abbreviation for 'example'."
+  },
+  "title": {
+    "message": "Наслов"
+  },
+  "mr": {
+    "message": "Г."
+  },
+  "mrs": {
+    "message": "Гђц."
+  },
+  "ms": {
+    "message": "Гђа."
+  },
+  "dr": {
+    "message": "Др"
+  },
+  "expirationMonth": {
+    "message": "Месец истека"
+  },
+  "expirationYear": {
+    "message": "Година истека"
+  },
+  "select": {
+    "message": "Изабери"
+  },
+  "other": {
+    "message": "Остало"
+  },
+  "generatePassword": {
+    "message": "Генерисање лозинке"
+  },
+  "type": {
+    "message": "Тип"
+  },
+  "firstName": {
+    "message": "Име"
+  },
+  "middleName": {
+    "message": "Средње име"
+  },
+  "lastName": {
+    "message": "Презиме"
+  },
+  "address1": {
+    "message": "Адреса 1"
+  },
+  "address2": {
+    "message": "Адреса 2"
+  },
+  "address3": {
+    "message": "Адреса 3"
+  },
+  "cityTown": {
+    "message": "Град"
+  },
+  "stateProvince": {
+    "message": "Држава / покрајина"
+  },
+  "zipPostalCode": {
+    "message": "Поштански број"
+  },
+  "country": {
+    "message": "Земља"
+  },
+  "save": {
+    "message": "Сачувај"
+  },
+  "cancel": {
+    "message": "Откажи"
+  },
+  "delete": {
+    "message": "Обриши"
+  },
+  "favorite": {
+    "message": "Омиљено"
+  },
+  "edit": {
+    "message": "Уреди"
+  },
+  "authenticatorKeyTotp": {
+    "message": "Кључ аутентификације (TOTP)"
+  },
+  "folder": {
+    "message": "Фасцикла"
+  },
+  "newCustomField": {
+    "message": "Ново прилагођено поље"
+  },
+  "value": {
+    "message": "Вредност"
+  },
+  "dragToSort": {
+    "message": "Превуците за сортирање"
+  },
+  "cfTypeText": {
+    "message": "Текст"
+  },
+  "cfTypeHidden": {
+    "message": "Сакривено"
+  },
+  "cfTypeBoolean": {
+    "message": "Булове"
+  },
+  "remove": {
+    "message": "Уклони"
+  },
+  "nameRequired": {
+    "message": "Име је неопходно."
+  },
+  "addedItem": {
+    "message": "Ставка додата"
+  },
+  "editedItem": {
+    "message": "Ставка уређена"
+  },
+  "deleteItem": {
+    "message": "Обриши ставку"
+  },
+  "deleteFolder": {
+    "message": "Избриши фасциклу"
+  },
+  "deleteAttachment": {
+    "message": "Избриши прилог"
+  },
+  "deleteItemConfirmation": {
+    "message": "Сигурно избрисати ову ставку?"
+  },
+  "deletedItem": {
+    "message": "Пошаљи ставку у Ђубре"
+  },
+  "overwritePasswordConfirmation": {
+    "message": "Сигурно преписати тренутну лозинку?"
+  },
+  "noneFolder": {
+    "message": "Нема фасцикле",
+    "description": "This is the folder for uncategorized items"
+  },
+  "addFolder": {
+    "message": "Додај фасциклу"
+  },
+  "editFolder": {
+    "message": "Уреди фасциклу"
+  },
+  "regeneratePassword": {
+    "message": "Поново генериши лозинку"
+  },
+  "copyPassword": {
+    "message": "Копирај лозинку"
+  },
+  "copyUri": {
+    "message": "Копирај УРЛ"
+  },
+  "length": {
+    "message": "Дужина"
+  },
+  "numWords": {
+    "message": "Број речи"
+  },
+  "wordSeparator": {
+    "message": "Одвајач речи"
+  },
+  "capitalize": {
+    "message": "Велика слова",
+    "description": "Make the first letter of a work uppercase."
+  },
+  "includeNumber": {
+    "message": "Убаци број"
+  },
+  "close": {
+    "message": "Затвори"
+  },
+  "minNumbers": {
+    "message": "Минимално Бројева"
+  },
+  "minSpecial": {
+    "message": "Минимално Специјално",
+    "description": "Minimum Special Characters"
+  },
+  "ambiguous": {
+    "message": "Avoid Ambiguous Characters"
+  },
+  "searchCollection": {
+    "message": "Претражи колекцију"
+  },
+  "searchFolder": {
+    "message": "Претражи фасцикли"
+  },
+  "searchFavorites": {
+    "message": "Претражи омиљене"
+  },
+  "searchType": {
+    "message": "Претражи тип",
+    "description": "Search item type"
+  },
+  "newAttachment": {
+    "message": "Додај нови прилог"
+  },
+  "deletedAttachment": {
+    "message": "Избрисани прилози"
+  },
+  "deleteAttachmentConfirmation": {
+    "message": "Сигурно обрисати овај прилог?"
+  },
+  "attachmentSaved": {
+    "message": "Прилог је сачуван."
+  },
+  "file": {
+    "message": "Датотека"
+  },
+  "selectFile": {
+    "message": "Изабери датотеку."
+  },
+  "maxFileSize": {
+    "message": "Максимална величина је 100МБ."
+  },
+  "updateKey": {
+    "message": "Не можете да користите ову способност док не промените Ваш кључ за шифровање."
+  },
+  "options": {
+    "message": "Опције"
+  },
+  "editedFolder": {
+    "message": "Фасцикла измењена"
+  },
+  "addedFolder": {
+    "message": "Фасцикла додата"
+  },
+  "deleteFolderConfirmation": {
+    "message": "Сигурно обрисати ову фасциклу?"
+  },
+  "deletedFolder": {
+    "message": "Deleted folder"
+  },
+  "loginOrCreateNewAccount": {
+    "message": "Log in or create a new account to access your secure vault."
+  },
+  "createAccount": {
+    "message": "Create Account"
+  },
+  "logIn": {
+    "message": "Log In"
+  },
+  "submit": {
+    "message": "Submit"
+  },
+  "masterPass": {
+    "message": "Master Password"
+  },
+  "masterPassDesc": {
+    "message": "The master password is the password you use to access your vault. It is very important that you do not forget your master password. There is no way to recover the password in the event that you forget it."
+  },
+  "masterPassHintDesc": {
+    "message": "A master password hint can help you remember your password if you forget it."
+  },
+  "reTypeMasterPass": {
+    "message": "Re-type Master Password"
+  },
+  "masterPassHint": {
+    "message": "Master Password Hint (optional)"
+  },
+  "settings": {
+    "message": "Settings"
+  },
+  "passwordHint": {
+    "message": "Password Hint"
+  },
+  "enterEmailToGetHint": {
+    "message": "Enter your account email address to receive your master password hint."
+  },
+  "getMasterPasswordHint": {
+    "message": "Get master password hint"
+  },
+  "emailRequired": {
+    "message": "Email address is required."
+  },
+  "invalidEmail": {
+    "message": "Invalid email address."
+  },
+  "masterPassRequired": {
+    "message": "Master password is required."
+  },
+  "masterPassLength": {
+    "message": "Master password must be at least 8 characters long."
+  },
+  "masterPassDoesntMatch": {
+    "message": "Master password confirmation does not match."
+  },
+  "newAccountCreated": {
+    "message": "Your new account has been created! You may now log in."
+  },
+  "masterPassSent": {
+    "message": "We've sent you an email with your master password hint."
+  },
+  "unexpectedError": {
+    "message": "An unexpected error has occurred."
+  },
+  "itemInformation": {
+    "message": "Item Information"
+  },
+  "noItemsInList": {
+    "message": "There are no items to list."
+  },
+  "verificationCode": {
+    "message": "Verification Code"
+  },
+  "verificationCodeRequired": {
+    "message": "Verification code is required."
+  },
+  "continue": {
+    "message": "Continue"
+  },
+  "enterVerificationCodeApp": {
+    "message": "Enter the 6 digit verification code from your authenticator app."
+  },
+  "enterVerificationCodeEmail": {
+    "message": "Enter the 6 digit verification code that was emailed to $EMAIL$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "example@gmail.com"
+      }
+    }
+  },
+  "verificationCodeEmailSent": {
+    "message": "Verification email sent to $EMAIL$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "example@gmail.com"
+      }
+    }
+  },
+  "rememberMe": {
+    "message": "Remember me"
+  },
+  "sendVerificationCodeEmailAgain": {
+    "message": "Send verification code email again"
+  },
+  "useAnotherTwoStepMethod": {
+    "message": "Use another two-step login method"
+  },
+  "insertYubiKey": {
+    "message": "Insert your YubiKey into your computer's USB port, then touch its button."
+  },
+  "insertU2f": {
+    "message": "Insert your security key into your computer's USB port. If it has a button, touch it."
+  },
+  "recoveryCodeDesc": {
+    "message": "Lost access to all of your two-factor providers? Use your recovery code to disable all two-factor providers from your account."
+  },
+  "recoveryCodeTitle": {
+    "message": "Recovery Code"
+  },
+  "authenticatorAppTitle": {
+    "message": "Authenticator App"
+  },
+  "authenticatorAppDesc": {
+    "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": {
+    "message": "YubiKey OTP Security Key"
+  },
+  "yubiKeyDesc": {
+    "message": "Use a YubiKey to access your account. Works with YubiKey 4, 4 Nano, 4C, and NEO devices."
+  },
+  "duoDesc": {
+    "message": "Verify with Duo Security using the Duo Mobile app, SMS, phone call, or U2F security key.",
+    "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
+  },
+  "duoOrganizationDesc": {
+    "message": "Verify with Duo Security for your organization using the Duo Mobile app, SMS, phone call, or U2F security key.",
+    "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
+  },
+  "u2fDesc": {
+    "message": "Use any FIDO U2F enabled security key to access your account."
+  },
+  "u2fTitle": {
+    "message": "FIDO U2F Security Key"
+  },
+  "emailTitle": {
+    "message": "Email"
+  },
+  "emailDesc": {
+    "message": "Verification codes will be emailed to you."
+  },
+  "loginUnavailable": {
+    "message": "Login Unavailable"
+  },
+  "noTwoStepProviders": {
+    "message": "This account has two-step login enabled, however, none of the configured two-step providers are supported by this device."
+  },
+  "noTwoStepProviders2": {
+    "message": "Please add additional providers that are better supported across devices (such as an authenticator app)."
+  },
+  "twoStepOptions": {
+    "message": "Опције дво-коракне пријаве"
+  },
+  "selfHostedEnvironment": {
+    "message": "Self-hosted Environment"
+  },
+  "selfHostedEnvironmentFooter": {
+    "message": "Specify the base URL of your on-premises hosted Bitwarden installation."
+  },
+  "customEnvironment": {
+    "message": "Custom Environment"
+  },
+  "customEnvironmentFooter": {
+    "message": "For advanced users. You can specify the base URL of each service independently."
+  },
+  "baseUrl": {
+    "message": "УРЛ Сервера"
+  },
+  "apiUrl": {
+    "message": "УРЛ АПИ Сервера"
+  },
+  "webVaultUrl": {
+    "message": "УРЛ сервера Сефа"
+  },
+  "identityUrl": {
+    "message": "УРЛ сервера идентитета"
+  },
+  "notificationsUrl": {
+    "message": "УРЛ сервера нотификације"
+  },
+  "iconsUrl": {
+    "message": "УРЛ сервера иконице"
+  },
+  "environmentSaved": {
+    "message": "The environment URLs have been saved."
+  },
+  "ok": {
+    "message": "У реду"
+  },
+  "yes": {
+    "message": "Да"
+  },
+  "no": {
+    "message": "Не"
+  },
+  "overwritePassword": {
+    "message": "Препиши лозинку"
+  },
+  "learnMore": {
+    "message": "Сазнај више"
+  },
+  "featureUnavailable": {
+    "message": "Функција је недоступна"
+  },
+  "loggedOut": {
+    "message": "Одјављено"
+  },
+  "loginExpired": {
+    "message": "Ваша сесија пријаве је истекла."
+  },
+  "logOutConfirmation": {
+    "message": "Заиста желите да се одјавите?"
+  },
+  "logOut": {
+    "message": "Одјави се"
+  },
+  "addNewLogin": {
+    "message": "Додај Нову Пријаву"
+  },
+  "addNewItem": {
+    "message": "Додај нову ставку"
+  },
+  "addNewFolder": {
+    "message": "Додај нову фасциклу"
+  },
+  "view": {
+    "message": "Приказ"
+  },
+  "account": {
+    "message": "Налог"
+  },
+  "loading": {
+    "message": "Учитавање..."
+  },
+  "lockNow": {
+    "message": "Закључај одмах"
+  },
+  "passwordGenerator": {
+    "message": "Генератор Лозинке"
+  },
+  "emailUs": {
+    "message": "Пошаљите нам поруку"
+  },
+  "visitOurWebsite": {
+    "message": "Посети наш веб-сајт"
+  },
+  "fileBugReport": {
+    "message": "File a Bug Report"
+  },
+  "blog": {
+    "message": "Блог"
+  },
+  "followUs": {
+    "message": "Прати нас"
+  },
+  "syncVault": {
+    "message": "Синхронизуј сеф"
+  },
+  "changeMasterPass": {
+    "message": "Промени Главну Лозинку"
+  },
+  "changeMasterPasswordConfirmation": {
+    "message": "You can change your master password on the bitwarden.com web vault. Do you want to visit the website now?"
+  },
+  "fingerprintPhrase": {
+    "message": "Фраза отиска прста",
+    "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
+  },
+  "yourAccountsFingerprint": {
+    "message": "Ваша фраза отиска прста за налог",
+    "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
+  },
+  "goToWebVault": {
+    "message": "Ићи на Сеф"
+  },
+  "getMobileApp": {
+    "message": "Апликација за телефон"
+  },
+  "getBrowserExtension": {
+    "message": "Додатак за прегледач"
+  },
+  "syncingComplete": {
+    "message": "Синхронизација завршена"
+  },
+  "syncingFailed": {
+    "message": "Синхронизација није успела"
+  },
+  "yourVaultIsLocked": {
+    "message": "Сеф је блокиран. Проверити главну лозинку за наставак."
+  },
+  "unlock": {
+    "message": "Откључај"
+  },
+  "loggedInAsOn": {
+    "message": "Пријављено са $EMAIL$ на $HOSTNAME$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      },
+      "hostname": {
+        "content": "$2",
+        "example": "bitwarden.com"
+      }
+    }
+  },
+  "invalidMasterPassword": {
+    "message": "Погрешна главна лозинка"
+  },
+  "twoStepLoginConfirmation": {
+    "message": "Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be enabled on the bitwarden.com web vault. Do you want to visit the website now?"
+  },
+  "twoStepLogin": {
+    "message": "Дво-коракна лозинка"
+  },
+  "vaultTimeout": {
+    "message": "Тајмаут сефа"
+  },
+  "vaultTimeoutDesc": {
+    "message": "Choose when your vault will timeout and perform the selected action."
+  },
+  "immediately": {
+    "message": "Одмах"
+  },
+  "tenSeconds": {
+    "message": "10 секунди"
+  },
+  "twentySeconds": {
+    "message": "20 секунди"
+  },
+  "thirtySeconds": {
+    "message": "30 секунди"
+  },
+  "oneMinute": {
+    "message": "1 минут"
+  },
+  "twoMinutes": {
+    "message": "2 минута"
+  },
+  "fiveMinutes": {
+    "message": "5 минута"
+  },
+  "fifteenMinutes": {
+    "message": "15 минута"
+  },
+  "thirtyMinutes": {
+    "message": "30 минута"
+  },
+  "oneHour": {
+    "message": "1 сат"
+  },
+  "fourHours": {
+    "message": "4 сата"
+  },
+  "onIdle": {
+    "message": "На мировање система"
+  },
+  "onSleep": {
+    "message": "На успавање система"
+  },
+  "onLocked": {
+    "message": "На блокирање система"
+  },
+  "onRestart": {
+    "message": "На поновно покретање"
+  },
+  "never": {
+    "message": "Никад"
+  },
+  "security": {
+    "message": "Сигурност"
+  },
+  "clearClipboard": {
+    "message": "Обриши клипборд",
+    "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
+  },
+  "clearClipboardDesc": {
+    "message": "Аутоматски обришите копиране вредности из клипборда.",
+    "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
+  },
+  "disableFavicon": {
+    "message": "Угаси иконице сајта"
+  },
+  "disableFaviconDesc": {
+    "message": "Иконе веб сајта пружају препознатљиву слику поред сваке пријаву у сефу."
+  },
+  "enableMinToTray": {
+    "message": "Умањи у систем трају"
+  },
+  "enableMinToTrayDesc": {
+    "message": "When minimizing the window, show an icon in the system tray instead."
+  },
+  "enableCloseToTray": {
+    "message": "Close to Tray Icon"
+  },
+  "enableCloseToTrayDesc": {
+    "message": "When closing the window, show an icon in the system tray instead."
+  },
+  "enableTray": {
+    "message": "Enable Tray Icon"
+  },
+  "enableTrayDesc": {
+    "message": "Always show an icon in the system tray."
+  },
+  "startToTray": {
+    "message": "Start To Tray Icon"
+  },
+  "startToTrayDesc": {
+    "message": "When the application is first started, only show an icon in the system tray."
+  },
+  "language": {
+    "message": "Језик"
+  },
+  "languageDesc": {
+    "message": "Change the language used by the application. Restart is required."
+  },
+  "theme": {
+    "message": "Theme"
+  },
+  "themeDesc": {
+    "message": "Change the application's color theme."
+  },
+  "dark": {
+    "message": "Dark",
+    "description": "Dark color"
+  },
+  "light": {
+    "message": "Light",
+    "description": "Light color"
+  },
+  "copy": {
+    "message": "Copy",
+    "description": "Copy to clipboard"
+  },
+  "checkForUpdates": {
+    "message": "Check For Updates"
+  },
+  "version": {
+    "message": "Version $VERSION_NUM$",
+    "placeholders": {
+      "version_num": {
+        "content": "$1",
+        "example": "1.2.3"
+      }
+    }
+  },
+  "restartToUpdate": {
+    "message": "Restart To Update"
+  },
+  "restartToUpdateDesc": {
+    "message": "Version $VERSION_NUM$ is ready to install. You must restart the application to complete the installation. Do you want to restart and update now?",
+    "placeholders": {
+      "version_num": {
+        "content": "$1",
+        "example": "1.2.3"
+      }
+    }
+  },
+  "updateAvailable": {
+    "message": "Update Available"
+  },
+  "updateAvailableDesc": {
+    "message": "An update was found. Do you want to download it now?"
+  },
+  "restart": {
+    "message": "Restart"
+  },
+  "later": {
+    "message": "Later"
+  },
+  "noUpdatesAvailable": {
+    "message": "No updates are currently available. You are using the latest version."
+  },
+  "updateError": {
+    "message": "Update Error"
+  },
+  "unknown": {
+    "message": "Unknown"
+  },
+  "copyUsername": {
+    "message": "Copy Username"
+  },
+  "copyNumber": {
+    "message": "Copy Number",
+    "description": "Copy credit card number"
+  },
+  "copySecurityCode": {
+    "message": "Copy Security Code",
+    "description": "Copy credit card security code (CVV)"
+  },
+  "premiumMembership": {
+    "message": "Premium Membership"
+  },
+  "premiumManage": {
+    "message": "Manage Membership"
+  },
+  "premiumManageAlert": {
+    "message": "You can manage your membership on the bitwarden.com web vault. Do you want to visit the website now?"
+  },
+  "premiumRefresh": {
+    "message": "Refresh Membership"
+  },
+  "premiumNotCurrentMember": {
+    "message": "You are not currently a premium member."
+  },
+  "premiumSignUpAndGet": {
+    "message": "Sign up for a premium membership and get:"
+  },
+  "premiumSignUpStorage": {
+    "message": "1 GB encrypted storage for file attachments."
+  },
+  "premiumSignUpTwoStep": {
+    "message": "Additional two-step login options such as YubiKey, FIDO U2F, and Duo."
+  },
+  "premiumSignUpReports": {
+    "message": "Password hygiene, account health, and data breach reports to keep your vault safe."
+  },
+  "premiumSignUpTotp": {
+    "message": "TOTP verification code (2FA) generator for logins in your vault."
+  },
+  "premiumSignUpSupport": {
+    "message": "Priority customer support."
+  },
+  "premiumSignUpFuture": {
+    "message": "All future premium features. More coming soon!"
+  },
+  "premiumPurchase": {
+    "message": "Купити премијум"
+  },
+  "premiumPurchaseAlert": {
+    "message": "You can purchase premium membership on the bitwarden.com web vault. Do you want to visit the website now?"
+  },
+  "premiumCurrentMember": {
+    "message": "You are a premium member!"
+  },
+  "premiumCurrentMemberThanks": {
+    "message": "Thank you for supporting Bitwarden."
+  },
+  "premiumPrice": {
+    "message": "All for just $PRICE$ /year!",
+    "placeholders": {
+      "price": {
+        "content": "$1",
+        "example": "$10"
+      }
+    }
+  },
+  "refreshComplete": {
+    "message": "Освежавање је завршено"
+  },
+  "passwordHistory": {
+    "message": "Историја Лозинке"
+  },
+  "clear": {
+    "message": "Очисти",
+    "description": "To clear something out. example: To clear browser history."
+  },
+  "noPasswordsInList": {
+    "message": "Нама лозинке у листи."
+  },
+  "undo": {
+    "message": "Опозови"
+  },
+  "redo": {
+    "message": "Понови"
+  },
+  "cut": {
+    "message": "Исеци",
+    "description": "Cut to clipboard"
+  },
+  "paste": {
+    "message": "Залепи",
+    "description": "Paste from clipboard"
+  },
+  "selectAll": {
+    "message": "Изабери све"
+  },
+  "zoomIn": {
+    "message": "Увећање"
+  },
+  "zoomOut": {
+    "message": "Умањење"
+  },
+  "resetZoom": {
+    "message": "Ресетуј зумирање"
+  },
+  "toggleFullScreen": {
+    "message": "Укључи/искључи приказ преко целог екрана"
+  },
+  "reload": {
+    "message": "Поново учитај"
+  },
+  "toggleDevTools": {
+    "message": "Укључи/искључи развојне алатке"
+  },
+  "minimize": {
+    "message": "Минимизирај",
+    "description": "Minimize window"
+  },
+  "zoom": {
+    "message": "Зумирај"
+  },
+  "bringAllToFront": {
+    "message": "Постави све у предњи план",
+    "description": "Bring all windows to front (foreground)"
+  },
+  "aboutBitwarden": {
+    "message": "О Bitwarden"
+  },
+  "services": {
+    "message": "Услуге"
+  },
+  "hideBitwarden": {
+    "message": "Сакриј Bitwarden"
+  },
+  "hideOthers": {
+    "message": "Сакриј остале"
+  },
+  "showAll": {
+    "message": "Прикажи све"
+  },
+  "quitBitwarden": {
+    "message": "Затвори Bitwarden"
+  },
+  "valueCopied": {
+    "message": "$VALUE$ копирано",
+    "description": "Value has been copied to the clipboard.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Password"
+      }
+    }
+  },
+  "help": {
+    "message": "Помоћ"
+  },
+  "window": {
+    "message": "Прозор"
+  },
+  "checkPassword": {
+    "message": "Проверите да ли је лозинка изложена."
+  },
+  "passwordExposed": {
+    "message": "Ова лозинка је изложена $VALUE$ пута. Требали би да је промените.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "passwordSafe": {
+    "message": "Ова лозинка није никада изложена. Треба да је сигурна за употребу."
+  },
+  "baseDomain": {
+    "message": "Главни домен"
+  },
+  "host": {
+    "message": "Хост",
+    "description": "A URL's host value. For example, the host of https://sub.domain.com:443 is 'sub.domain.com:443'."
+  },
+  "exact": {
+    "message": "Тачно"
+  },
+  "startsWith": {
+    "message": "Почиње са"
+  },
+  "regEx": {
+    "message": "Регуларни израз",
+    "description": "A programming term, also known as 'RegEx'."
+  },
+  "matchDetection": {
+    "message": "Налажење везе",
+    "description": "URI match detection for auto-fill."
+  },
+  "defaultMatchDetection": {
+    "message": "Стандардно налажење вење",
+    "description": "Default URI match detection for auto-fill."
+  },
+  "toggleOptions": {
+    "message": "Пребацити опције"
+  },
+  "organization": {
+    "message": "Организација",
+    "description": "An entity of multiple related people (ex. a team or business organization)."
+  },
+  "default": {
+    "message": "Подразумевано"
+  },
+  "exit": {
+    "message": "Изађи"
+  },
+  "showHide": {
+    "message": "Покажи/Сакриј",
+    "description": "Text for a button that toggles the visibility of the window. Shows the window when it is hidden or hides the window if it is currently open."
+  },
+  "hideToTray": {
+    "message": "Hide to Tray"
+  },
+  "alwaysOnTop": {
+    "message": "Увек на врху",
+    "description": "Application window should always stay on top of other windows"
+  },
+  "dateUpdated": {
+    "message": "Ажурирано",
+    "description": "ex. Date this item was updated"
+  },
+  "datePasswordUpdated": {
+    "message": "Password Updated",
+    "description": "ex. Date this password was updated"
+  },
+  "exportVault": {
+    "message": "Export Vault"
+  },
+  "fileFormat": {
+    "message": "File Format"
+  },
+  "warning": {
+    "message": "WARNING",
+    "description": "WARNING (should stay in capitalized letters if the language permits)"
+  },
+  "exportWarningDesc": {
+    "message": "This export contains your vault data in an unencrypted format. You should not store or send the exported file over unsecure channels (such as email). Delete it immediately after you are done using it."
+  },
+  "exportMasterPassword": {
+    "message": "Enter your master password to export your vault data."
+  },
+  "noOrganizationsList": {
+    "message": "You do not belong to any organizations. Organizations allow you to securely share items with other users."
+  },
+  "noCollectionsInList": {
+    "message": "There are no collections to list."
+  },
+  "ownership": {
+    "message": "Ownership"
+  },
+  "whoOwnsThisItem": {
+    "message": "Who owns this item?"
+  },
+  "strong": {
+    "message": "Strong",
+    "description": "ex. A strong password. Scale: Weak -> Good -> Strong"
+  },
+  "good": {
+    "message": "Good",
+    "description": "ex. A good password. Scale: Weak -> Good -> Strong"
+  },
+  "weak": {
+    "message": "Weak",
+    "description": "ex. A weak password. Scale: Weak -> Good -> Strong"
+  },
+  "weakMasterPassword": {
+    "message": "Weak Master Password"
+  },
+  "weakMasterPasswordDesc": {
+    "message": "The master password you have chosen is weak. You should use a strong master password (or a passphrase) to properly protect your Bitwarden account. Are you sure you want to use this master password?"
+  },
+  "pin": {
+    "message": "PIN",
+    "description": "PIN code. Ex. The short code (often numeric) that you use to unlock a device."
+  },
+  "unlockWithPin": {
+    "message": "Unlock with PIN"
+  },
+  "setYourPinCode": {
+    "message": "Set your PIN code for unlocking Bitwarden. Your PIN settings will be reset if you ever fully log out of the application."
+  },
+  "pinRequired": {
+    "message": "PIN code is required."
+  },
+  "invalidPin": {
+    "message": "Invalid PIN code."
+  },
+  "yourVaultIsLockedPinCode": {
+    "message": "Your vault is locked. Verify your PIN code to continue."
+  },
+  "unlockWithWindowsHello": {
+    "message": "Unlock with Windows Hello"
+  },
+  "windowsHelloConsentMessage": {
+    "message": "Verify for Bitwarden."
+  },
+  "unlockWithTouchId": {
+    "message": "Unlock with Touch ID"
+  },
+  "touchIdConsentMessage": {
+    "message": "Verify for Bitwarden."
+  },
+  "lockWithMasterPassOnRestart": {
+    "message": "Lock with master password on restart"
+  },
+  "preferences": {
+    "message": "Preferences"
+  },
+  "enableMenuBar": {
+    "message": "Enable Menu Bar Icon"
+  },
+  "enableMenuBarDesc": {
+    "message": "Always show an icon in the menu bar."
+  },
+  "hideToMenuBar": {
+    "message": "Hide to Menu Bar"
+  },
+  "selectOneCollection": {
+    "message": "You must select at least one collection."
+  },
+  "premiumUpdated": {
+    "message": "You've upgraded to premium."
+  },
+  "restore": {
+    "message": "Restore"
+  },
+  "premiumManageAlertAppStore": {
+    "message": "You can manage your subscription from the App Store. Do you want to visit the App Store now?"
+  },
+  "legal": {
+    "message": "Legal",
+    "description": "Noun. As in 'legal documents', like our terms of service and privacy policy."
+  },
+  "termsOfService": {
+    "message": "Terms of Service"
+  },
+  "privacyPolicy": {
+    "message": "Privacy Policy"
+  },
+  "unsavedChangesConfirmation": {
+    "message": "Are you sure you want to leave? If you leave now then your current information will not be saved."
+  },
+  "unsavedChangesTitle": {
+    "message": "Unsaved Changes"
+  },
+  "clone": {
+    "message": "Clone"
+  },
+  "passwordGeneratorPolicyInEffect": {
+    "message": "One or more organization policies are affecting your generator settings."
+  },
+  "vaultTimeoutAction": {
+    "message": "Vault Timeout Action"
+  },
+  "vaultTimeoutActionLockDesc": {
+    "message": "A locked vault requires that you re-enter your master password to access it again."
+  },
+  "vaultTimeoutActionLogOutDesc": {
+    "message": "A logged out vault requires that you re-authenticate to access it again."
+  },
+  "lock": {
+    "message": "Lock",
+    "description": "Verb form: to make secure or inaccesible by"
+  },
+  "trash": {
+    "message": "Смеће",
+    "description": "Noun: a special folder to hold deleted items"
+  },
+  "searchTrash": {
+    "message": "Тражи смеће"
+  },
+  "permanentlyDeleteItem": {
+    "message": "Трајно избрисати ставку"
+  },
+  "permanentlyDeleteItemConfirmation": {
+    "message": "Да ли сте сигурни да желите да трајно избришете ову ставку?"
+  },
+  "permanentlyDeletedItem": {
+    "message": "Трајно избрисати ставку"
+  },
+  "restoreItem": {
+    "message": "Врати ставку"
+  },
+  "restoreItemConfirmation": {
+    "message": "Да ли сте сигурни да желите да вратите ову ставку?"
+  },
+  "restoredItem": {
+    "message": "Ставка враћена"
+  },
+  "permanentlyDelete": {
+    "message": "Трајно избрисати"
+  },
+  "vaultTimeoutLogOutConfirmation": {
+    "message": "Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?"
+  },
+  "vaultTimeoutLogOutConfirmationTitle": {
+    "message": "Timeout Action Confirmation"
+  },
+  "enterpriseSingleSignOn": {
+    "message": "Enterprise Single Sign-On"
+  },
+  "setMasterPassword": {
+    "message": "Постави Главну Лозинку"
+  },
+  "ssoCompleteRegistration": {
+    "message": "In order to complete logging in with SSO, please set a master password to access and protect your vault."
+  },
+  "newMasterPass": {
+    "message": "Нова Главна Лозинка"
+  },
+  "confirmNewMasterPass": {
+    "message": "Потрдити нову Главну Лозинку"
+  },
+  "masterPasswordPolicyInEffect": {
+    "message": "One or more organization policies require your master password to meet the following requirements:"
+  },
+  "policyInEffectMinComplexity": {
+    "message": "Minimum complexity score of $SCORE$",
+    "placeholders": {
+      "score": {
+        "content": "$1",
+        "example": "4"
+      }
+    }
+  },
+  "policyInEffectMinLength": {
+    "message": "Minimum length of $LENGTH$",
+    "placeholders": {
+      "length": {
+        "content": "$1",
+        "example": "14"
+      }
+    }
+  },
+  "policyInEffectUppercase": {
+    "message": "Contain one or more uppercase characters"
+  },
+  "policyInEffectLowercase": {
+    "message": "Contain one or more lowercase characters"
+  },
+  "policyInEffectNumbers": {
+    "message": "Садрже један или више бројева"
+  },
+  "policyInEffectSpecial": {
+    "message": "Садрже један или више бројева ових специјалних слова $CHARS$",
+    "placeholders": {
+      "chars": {
+        "content": "$1",
+        "example": "!@#$%^&*"
+      }
+    }
+  },
+  "masterPasswordPolicyRequirementsNotMet": {
+    "message": "Your new master password does not meet the policy requirements."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+  }
+}
diff --git a/src/locales/sv/messages.json b/src/locales/sv/messages.json
index 95dc2d595f..0f0620a772 100644
--- a/src/locales/sv/messages.json
+++ b/src/locales/sv/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Ditt nya huvudlösenord uppfyller inte kraven i policyn."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/th/messages.json b/src/locales/th/messages.json
index 7fd91c01fb..c7ff4e2412 100644
--- a/src/locales/th/messages.json
+++ b/src/locales/th/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Your new master password does not meet the policy requirements."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/tr/messages.json b/src/locales/tr/messages.json
index a225a69d97..3ad989edd8 100644
--- a/src/locales/tr/messages.json
+++ b/src/locales/tr/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Yeni ana parolanız ilke gereksinimlerini karşılamıyor."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/uk/messages.json b/src/locales/uk/messages.json
index 2a6d8c3b69..e20a3c75a9 100644
--- a/src/locales/uk/messages.json
+++ b/src/locales/uk/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Ваш новий головний пароль не задовольняє вимоги політики."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/vi/messages.json b/src/locales/vi/messages.json
index 37fd3d05b7..1a8600eca6 100644
--- a/src/locales/vi/messages.json
+++ b/src/locales/vi/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Your new master password does not meet the policy requirements."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/zh_CN/messages.json b/src/locales/zh_CN/messages.json
index ddc7e84bff..4147148c6e 100644
--- a/src/locales/zh_CN/messages.json
+++ b/src/locales/zh_CN/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "您的新主密码不符合策略要求。"
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }
diff --git a/src/locales/zh_TW/messages.json b/src/locales/zh_TW/messages.json
index aab2d37d2b..2483074184 100644
--- a/src/locales/zh_TW/messages.json
+++ b/src/locales/zh_TW/messages.json
@@ -1401,5 +1401,11 @@
   },
   "masterPasswordPolicyRequirementsNotMet": {
     "message": "Your new master password does not meet the policy requirements."
+  },
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   }
 }

From e3c4d4f80d968bdac10c208f841413fd4eb6d8a2 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kspearrin@users.noreply.github.com>
Date: Thu, 12 Nov 2020 21:45:03 -0500
Subject: [PATCH 14/14] New Crowdin updates (#587)

* New translations messages.json (Romanian)

* New translations messages.json (Russian)

* New translations messages.json (Montenegrin (Latin))

* New translations messages.json (Malayalam)

* New translations messages.json (English, United Kingdom)

* New translations messages.json (Indonesian)

* New translations messages.json (Portuguese, Brazilian)

* New translations messages.json (Chinese Traditional)

* New translations messages.json (Chinese Simplified)

* New translations messages.json (Ukrainian)

* New translations messages.json (Serbian (Cyrillic))

* New translations messages.json (Slovak)

* New translations messages.json (Portuguese)

* New translations messages.json (French)

* New translations messages.json (Polish)

* New translations messages.json (Dutch)

* New translations messages.json (Japanese)

* New translations messages.json (Hungarian)

* New translations messages.json (Hebrew)

* New translations messages.json (Finnish)

* New translations messages.json (German)

* New translations messages.json (Danish)

* New translations messages.json (Czech)

* New translations messages.json (Catalan)

* New translations messages.json (Spanish)
---
 src/locales/ca/messages.json    |   4 +-
 src/locales/cs/messages.json    |   2 +-
 src/locales/da/messages.json    |   4 +-
 src/locales/de/messages.json    |   4 +-
 src/locales/en_GB/messages.json |   2 +-
 src/locales/es/messages.json    |   4 +-
 src/locales/fi/messages.json    |   4 +-
 src/locales/fr/messages.json    |   4 +-
 src/locales/he/messages.json    |   4 +-
 src/locales/hu/messages.json    |   4 +-
 src/locales/id/messages.json    |   4 +-
 src/locales/ja/messages.json    |   4 +-
 src/locales/me/messages.json    |   4 +-
 src/locales/ml/messages.json    |  10 +-
 src/locales/nl/messages.json    |   4 +-
 src/locales/pl/messages.json    |   8 +-
 src/locales/pt_BR/messages.json |   4 +-
 src/locales/pt_PT/messages.json |   2 +-
 src/locales/ro/messages.json    | 296 ++++++++++++++--------------
 src/locales/ru/messages.json    |   4 +-
 src/locales/sk/messages.json    |  46 ++---
 src/locales/sr/messages.json    | 328 ++++++++++++++++----------------
 src/locales/uk/messages.json    |   6 +-
 src/locales/zh_CN/messages.json |   4 +-
 src/locales/zh_TW/messages.json |   4 +-
 25 files changed, 382 insertions(+), 382 deletions(-)

diff --git a/src/locales/ca/messages.json b/src/locales/ca/messages.json
index 4fb2cd6500..52dab21bf6 100644
--- a/src/locales/ca/messages.json
+++ b/src/locales/ca/messages.json
@@ -1403,9 +1403,9 @@
     "message": "La nova contrasenya principal no compleix els requisits de la política."
   },
   "acceptPolicies": {
-    "message": "By checking this box you agree to the following:"
+    "message": "Si activeu aquesta casella, indiqueu que esteu d’acord amb el següent:"
   },
   "acceptPoliciesError": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "No s’han reconegut les condicions del servei i la declaració de privadesa."
   }
 }
diff --git a/src/locales/cs/messages.json b/src/locales/cs/messages.json
index 825401f58a..c9616390ab 100644
--- a/src/locales/cs/messages.json
+++ b/src/locales/cs/messages.json
@@ -1403,7 +1403,7 @@
     "message": "Vaše nové hlavní heslo nesplňuje požadavky zásad."
   },
   "acceptPolicies": {
-    "message": "By checking this box you agree to the following:"
+    "message": "Zaškrtnutím tohoto políčka souhlasím s následujícím:"
   },
   "acceptPoliciesError": {
     "message": "Terms of Service and Privacy Policy have not been acknowledged."
diff --git a/src/locales/da/messages.json b/src/locales/da/messages.json
index a7de8b88d2..19c226b28b 100644
--- a/src/locales/da/messages.json
+++ b/src/locales/da/messages.json
@@ -1403,9 +1403,9 @@
     "message": "Din nye hovedadgangskode opfylder ikke politikkravene."
   },
   "acceptPolicies": {
-    "message": "By checking this box you agree to the following:"
+    "message": "Ved at markere dette felt accepterer du følgende:"
   },
   "acceptPoliciesError": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "Servicevilkår og fortrolighedspolitik er ikke blevet bekræftet."
   }
 }
diff --git a/src/locales/de/messages.json b/src/locales/de/messages.json
index eece04a41d..346637c558 100644
--- a/src/locales/de/messages.json
+++ b/src/locales/de/messages.json
@@ -1403,9 +1403,9 @@
     "message": "Ihr neues Masterpasswort entspricht nicht den Anforderungen der Richtlinie."
   },
   "acceptPolicies": {
-    "message": "By checking this box you agree to the following:"
+    "message": "Durch Anwählen dieses Kästchens erklären Sie sich mit folgendem einverstanden:"
   },
   "acceptPoliciesError": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "Die Nutzungsbedingungen und Datenschutzerklärung wurden nicht akzeptiert."
   }
 }
diff --git a/src/locales/en_GB/messages.json b/src/locales/en_GB/messages.json
index db051b3cef..d2210e2569 100644
--- a/src/locales/en_GB/messages.json
+++ b/src/locales/en_GB/messages.json
@@ -1406,6 +1406,6 @@
     "message": "By checking this box you agree to the following:"
   },
   "acceptPoliciesError": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "Terms of service and privacy policy have not been acknowledged."
   }
 }
diff --git a/src/locales/es/messages.json b/src/locales/es/messages.json
index 82a2c7eea9..ebfde7fa5f 100644
--- a/src/locales/es/messages.json
+++ b/src/locales/es/messages.json
@@ -1403,9 +1403,9 @@
     "message": "Su nueva contraseña maestra no cumple con los requisitos de la política."
   },
   "acceptPolicies": {
-    "message": "By checking this box you agree to the following:"
+    "message": "Al seleccionar esta casilla, acepto lo siguiente:"
   },
   "acceptPoliciesError": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "Todavía no has aceptado los términos del servicio y la política de privacidad."
   }
 }
diff --git a/src/locales/fi/messages.json b/src/locales/fi/messages.json
index 507bf302d8..aa3df22f34 100644
--- a/src/locales/fi/messages.json
+++ b/src/locales/fi/messages.json
@@ -1403,9 +1403,9 @@
     "message": "Uusi pääsalasanasi ei täytä käytäntövaatimuksia."
   },
   "acceptPolicies": {
-    "message": "By checking this box you agree to the following:"
+    "message": "Valitsemalla tämän ruudun hyväksyt seuraavat:"
   },
   "acceptPoliciesError": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "Palvelu- ja tietosuojakäytäntöä ei ole vahvistettu."
   }
 }
diff --git a/src/locales/fr/messages.json b/src/locales/fr/messages.json
index ef4bfa7bb0..c4c1b0a570 100644
--- a/src/locales/fr/messages.json
+++ b/src/locales/fr/messages.json
@@ -1403,9 +1403,9 @@
     "message": "Votre nouveau mot de passe maître ne répond pas aux exigences de la politique."
   },
   "acceptPolicies": {
-    "message": "By checking this box you agree to the following:"
+    "message": "En cochant cette case, vous acceptez les éléments suivants :"
   },
   "acceptPoliciesError": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "Les conditions d'utilisation et la politique de confidentialité n'ont pas été acceptées."
   }
 }
diff --git a/src/locales/he/messages.json b/src/locales/he/messages.json
index e3dabd5ff1..b0f05b9c76 100644
--- a/src/locales/he/messages.json
+++ b/src/locales/he/messages.json
@@ -1403,9 +1403,9 @@
     "message": "הסיסמה הראשית החדשה השלך לא עומדת בדרישות המדיניות."
   },
   "acceptPolicies": {
-    "message": "By checking this box you agree to the following:"
+    "message": "סימון התיבה הזאת מהווה את הסכמתך לתנאים הבאים:"
   },
   "acceptPoliciesError": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "לא הסכמת לתנאי השירות ומדיניות הפרטיות."
   }
 }
diff --git a/src/locales/hu/messages.json b/src/locales/hu/messages.json
index 62fe4e38dd..e05792647c 100644
--- a/src/locales/hu/messages.json
+++ b/src/locales/hu/messages.json
@@ -1403,9 +1403,9 @@
     "message": "Az új mesterjelszó nem felel meg a szabály követelményeknek."
   },
   "acceptPolicies": {
-    "message": "By checking this box you agree to the following:"
+    "message": "A kapcsoló bekapcsolásával egyetértünk a következőkkel:"
   },
   "acceptPoliciesError": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "A szolgáltatási feltételeket és az adatvédelmi irányelveket nem vették figyelembe."
   }
 }
diff --git a/src/locales/id/messages.json b/src/locales/id/messages.json
index e0a0576a27..48793adbb8 100644
--- a/src/locales/id/messages.json
+++ b/src/locales/id/messages.json
@@ -1403,9 +1403,9 @@
     "message": "Kata sandi utama Anda yang baru tidak memenuhi persyaratan kebijakan."
   },
   "acceptPolicies": {
-    "message": "By checking this box you agree to the following:"
+    "message": "Dengan mencentang kotak ini, anda menyetujui yang berikut:"
   },
   "acceptPoliciesError": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "Persyaratan Layanan dan Kebijakan Privasi belum diakui."
   }
 }
diff --git a/src/locales/ja/messages.json b/src/locales/ja/messages.json
index 3599259e41..c9b0bcff13 100644
--- a/src/locales/ja/messages.json
+++ b/src/locales/ja/messages.json
@@ -1403,9 +1403,9 @@
     "message": "新しいマスターパスワードは最低要件を満たしていません。"
   },
   "acceptPolicies": {
-    "message": "By checking this box you agree to the following:"
+    "message": "以下に同意しチェックします:"
   },
   "acceptPoliciesError": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "利用規約とプライバシーポリシーを確認してください。"
   }
 }
diff --git a/src/locales/me/messages.json b/src/locales/me/messages.json
index f170c9a090..90748357fe 100644
--- a/src/locales/me/messages.json
+++ b/src/locales/me/messages.json
@@ -1403,9 +1403,9 @@
     "message": "Your new master password does not meet the policy requirements."
   },
   "acceptPolicies": {
-    "message": "By checking this box you agree to the following:"
+    "message": "Označavanjem ovog polja pristajete na sledeće:"
   },
   "acceptPoliciesError": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "Uslovi usluge i Politika privatnosti nisu prihvaćeni."
   }
 }
diff --git a/src/locales/ml/messages.json b/src/locales/ml/messages.json
index d13f5dcf58..036beaab04 100644
--- a/src/locales/ml/messages.json
+++ b/src/locales/ml/messages.json
@@ -328,7 +328,7 @@
     "message": "ചേർക്കപ്പെട്ട ഇനം"
   },
   "editedItem": {
-    "message": "തിരുത്തപ്പെട്ട ഇനം"
+    "message": "ഇനം തിരുത്തി"
   },
   "deleteItem": {
     "message": "ഇനം ഇല്ലാതാക്കുക"
@@ -437,7 +437,7 @@
     "message": "ഓപ്ഷനുകൾ"
   },
   "editedFolder": {
-    "message": "തിരുത്തിയ ഫോൾഡറുകൾ"
+    "message": "ഫോൾഡർ തിരുത്തി"
   },
   "addedFolder": {
     "message": "ചേർക്കപ്പെട്ട ഫോൾഡർ"
@@ -586,7 +586,7 @@
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "duoOrganizationDesc": {
-    "message": "Duo Mobile, എസ്എംഎസ്, ഫോൺ കോൾ അല്ലെങ്കിൽ യു 2 എഫ് സുരക്ഷാ കീ ഉപയോഗിച്ച് നിങ്ങളുടെ ഓർഗനൈസേഷനെ ഡ്യുവോ സെക്യൂരിറ്റി ഉപയോഗിച്ച് പരിശോധിക്കുക.",
+    "message": "Duo Mobile, SMS, ഫോൺ കോൾ അല്ലെങ്കിൽ U2F സുരക്ഷാ കീ ഉപയോഗിച്ച് നിങ്ങളുടെ ഓർഗനൈസേഷനെ Duo Security ഉപയോഗിച്ച് പരിശോധിക്കുക.",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "u2fDesc": {
@@ -1403,9 +1403,9 @@
     "message": "നിങ്ങളുടെ പുതിയ മാസ്റ്റർ പാസ്‌വേഡ് നയ ആവശ്യകതകൾ നിറവേറ്റുന്നില്ല."
   },
   "acceptPolicies": {
-    "message": "By checking this box you agree to the following:"
+    "message": "ഈ ബോക്സ് ചെക്കുചെയ്യുന്നതിലൂടെ നിങ്ങൾ ഇനിപ്പറയുന്നവ അംഗീകരിക്കുന്നു:"
   },
   "acceptPoliciesError": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "സേവന നിബന്ധനകളും സ്വകാര്യതാ നയവും അംഗീകരിച്ചിട്ടില്ല."
   }
 }
diff --git a/src/locales/nl/messages.json b/src/locales/nl/messages.json
index cc9cbf4e04..c82f0e1bd4 100644
--- a/src/locales/nl/messages.json
+++ b/src/locales/nl/messages.json
@@ -1403,9 +1403,9 @@
     "message": "Je nieuwe hoofdwachtwoord voldoet niet aan de beleidseisen."
   },
   "acceptPolicies": {
-    "message": "By checking this box you agree to the following:"
+    "message": "Door dit vakje aan te vinken, ga je akkoord met het volgende:"
   },
   "acceptPoliciesError": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "Algemene voorwaarden en privacybeleid zijn nog niet erkend."
   }
 }
diff --git a/src/locales/pl/messages.json b/src/locales/pl/messages.json
index dd2413bda9..7dafe5eca3 100644
--- a/src/locales/pl/messages.json
+++ b/src/locales/pl/messages.json
@@ -629,7 +629,7 @@
     "message": "Adres URL serwera"
   },
   "apiUrl": {
-    "message": "Adres URL serwera API"
+    "message": "Adres URL serwera interfejsu API"
   },
   "webVaultUrl": {
     "message": "Adres URL serwera sejfu internetowego"
@@ -1346,7 +1346,7 @@
     "message": "Potwierdź sposób blokowania sejfu"
   },
   "enterpriseSingleSignOn": {
-    "message": "Logowanie jednokrotne przedsiębiorstwa"
+    "message": "Logowanie jednokrotne"
   },
   "setMasterPassword": {
     "message": "Ustaw hasło główne"
@@ -1403,9 +1403,9 @@
     "message": "Nowe hasło główne nie spełnia wymaganych zasad."
   },
   "acceptPolicies": {
-    "message": "By checking this box you agree to the following:"
+    "message": "Zaznaczając tę opcję, akceptujesz:"
   },
   "acceptPoliciesError": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "Nie zaakceptowałeś regulaminu i polityki prywatności."
   }
 }
diff --git a/src/locales/pt_BR/messages.json b/src/locales/pt_BR/messages.json
index 4b2b8a0f37..7bf6d38859 100644
--- a/src/locales/pt_BR/messages.json
+++ b/src/locales/pt_BR/messages.json
@@ -1403,9 +1403,9 @@
     "message": "A sua nova senha mestra não cumpre aos requisitos da política."
   },
   "acceptPolicies": {
-    "message": "By checking this box you agree to the following:"
+    "message": "Ao marcar esta caixa, você concorda com o seguinte:"
   },
   "acceptPoliciesError": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "Os Termos de Serviço e a Política de Privacidade não foram reconhecidos."
   }
 }
diff --git a/src/locales/pt_PT/messages.json b/src/locales/pt_PT/messages.json
index 3b40ed7d79..04a9081f05 100644
--- a/src/locales/pt_PT/messages.json
+++ b/src/locales/pt_PT/messages.json
@@ -1403,7 +1403,7 @@
     "message": "A sua nova palavra-passe mestra não cumpre os requisitos da política."
   },
   "acceptPolicies": {
-    "message": "By checking this box you agree to the following:"
+    "message": "Ao marcar esta caixa concorda com o seguinte:"
   },
   "acceptPoliciesError": {
     "message": "Terms of Service and Privacy Policy have not been acknowledged."
diff --git a/src/locales/ro/messages.json b/src/locales/ro/messages.json
index f275054c09..94867971f9 100644
--- a/src/locales/ro/messages.json
+++ b/src/locales/ro/messages.json
@@ -15,7 +15,7 @@
     "message": "Tipuri"
   },
   "typeLogin": {
-    "message": "Autentificare"
+    "message": "Conectare"
   },
   "typeCard": {
     "message": "Card"
@@ -33,7 +33,7 @@
     "message": "Colecții"
   },
   "searchVault": {
-    "message": "Căutaţi în seif"
+    "message": "Căutați în seif"
   },
   "addItem": {
     "message": "Adăugare articol"
@@ -45,22 +45,22 @@
     "message": "Distribuie"
   },
   "shareItem": {
-    "message": "Share Item"
+    "message": "Partajați articolul"
   },
   "sharedItem": {
-    "message": "Shared Item"
+    "message": "Articol partajat"
   },
   "shareDesc": {
-    "message": "Choose an organization that you wish to share this item with. Sharing transfers ownership of the item to the organization. You will no longer be the direct owner of this item once it has been shared."
+    "message": "Alegeți o organizație cu care doriți să partajați acest element. Partajarea transferă proprietatea asupra articolului către organizație. Nu veți mai fi proprietarul direct al acestui articol după ce a fost distribuit."
   },
   "attachments": {
     "message": "Atașamente"
   },
   "viewItem": {
-    "message": "Vizualizare articol"
+    "message": "Vedeți articolul"
   },
   "name": {
-    "message": "Denumire"
+    "message": "Nume"
   },
   "uri": {
     "message": "URI"
@@ -122,7 +122,7 @@
     "message": "Comutare vizibilitate"
   },
   "toggleCollapse": {
-    "message": "Toggle Collapse",
+    "message": "Comută pe afișare articole",
     "description": "Toggling an expand/collapse state."
   },
   "cardholderName": {
@@ -141,7 +141,7 @@
     "message": "Cod de securitate"
   },
   "identityName": {
-    "message": "identityName"
+    "message": "Numele Identității"
   },
   "company": {
     "message": "Companie"
@@ -150,10 +150,10 @@
     "message": "Număr de securitate socială"
   },
   "passportNumber": {
-    "message": "Număr pașaport"
+    "message": "Număr de pașaport"
   },
   "licenseNumber": {
-    "message": "Număr licență"
+    "message": "Numărul licenței"
   },
   "email": {
     "message": "E-mail"
@@ -286,7 +286,7 @@
     "message": "Anulare"
   },
   "delete": {
-    "message": "Ştergeţi"
+    "message": "Ștergeți"
   },
   "favorite": {
     "message": "Favorit"
@@ -307,7 +307,7 @@
     "message": "Valoare"
   },
   "dragToSort": {
-    "message": "Drag to sort"
+    "message": "Trageți pentru sortare"
   },
   "cfTypeText": {
     "message": "Text"
@@ -331,19 +331,19 @@
     "message": "Articol editat"
   },
   "deleteItem": {
-    "message": "Ștergere articol"
+    "message": "Șterge articolul"
   },
   "deleteFolder": {
-    "message": "Ștergere dosar"
+    "message": "Șterge dosarul"
   },
   "deleteAttachment": {
-    "message": "Ştergere ataşament"
+    "message": "Șterge atașamentul"
   },
   "deleteItemConfirmation": {
     "message": "Sigur ștergeți acest articol?"
   },
   "deletedItem": {
-    "message": "Articol șters"
+    "message": "Articol trimis în trash"
   },
   "overwritePasswordConfirmation": {
     "message": "Sunteţi sigur că doriţi să suprascrieţi parola curentă?"
@@ -371,10 +371,10 @@
     "message": "Lungime"
   },
   "numWords": {
-    "message": "Number of Words"
+    "message": "Număr de cuvinte"
   },
   "wordSeparator": {
-    "message": "Word Separator"
+    "message": "Separator de cuvinte"
   },
   "capitalize": {
     "message": "Majuscule inițiale",
@@ -390,45 +390,45 @@
     "message": "Număr minim de caractere"
   },
   "minSpecial": {
-    "message": "Număr minim de caractere speciale",
+    "message": "Minimum de caractere speciale",
     "description": "Minimum Special Characters"
   },
   "ambiguous": {
     "message": "Evitați caracterele ambigue"
   },
   "searchCollection": {
-    "message": "Căutare colecție"
+    "message": "Caută în colecție"
   },
   "searchFolder": {
-    "message": "Căutare dosar"
+    "message": "Caută în Dosar"
   },
   "searchFavorites": {
     "message": "Caută în Favorite"
   },
   "searchType": {
-    "message": "Tipul de căutare",
+    "message": "Caută în Tipuri",
     "description": "Search item type"
   },
   "newAttachment": {
-    "message": "Adăugaţi un nou ataşament"
+    "message": "Adăugați un nou atașament"
   },
   "deletedAttachment": {
-    "message": "Ataşament şters"
+    "message": "Atașament șters"
   },
   "deleteAttachmentConfirmation": {
-    "message": "Sunteţi sigur că doriţi să ştergeţi acest atașament?"
+    "message": "Sunteți sigur că doriți să ștergeți acest atașament?"
   },
   "attachmentSaved": {
-    "message": "Ataşamentul a fost salvat."
+    "message": "Atașamentul a fost salvat."
   },
   "file": {
-    "message": "Fişier"
+    "message": "Fișier"
   },
   "selectFile": {
     "message": "Selectați un fișier."
   },
   "maxFileSize": {
-    "message": "Mărimea maximă a fişierului este de 100 MB."
+    "message": "Mărimea maximă a fișierului este de 100 MB."
   },
   "updateKey": {
     "message": "Veți putea utiliza această caracteristică după ce veți actualiza cheia de criptare."
@@ -446,19 +446,19 @@
     "message": "Sunteți sigur că vreți să ștergeți dosarul?"
   },
   "deletedFolder": {
-    "message": "Dosar şters"
+    "message": "Dosar șters"
   },
   "loginOrCreateNewAccount": {
-    "message": "Autentificați-vă sau creați un cont nou pentru a vă accesa seiful dvs. securizat."
+    "message": "Conectați-vă sau creați un cont nou pentru a vă accesa seiful securizat."
   },
   "createAccount": {
     "message": "Creare cont"
   },
   "logIn": {
-    "message": "Autentificare"
+    "message": "Conectare"
   },
   "submit": {
-    "message": "Trimitere"
+    "message": "Trimite"
   },
   "masterPass": {
     "message": "Parola principală"
@@ -491,19 +491,19 @@
     "message": "Adresa de e-mail este necesară."
   },
   "invalidEmail": {
-    "message": "Adresa de email greșită."
+    "message": "Adresa de e-mail greșită."
   },
   "masterPassRequired": {
     "message": "Este necesară parola principală."
   },
   "masterPassLength": {
-    "message": "Parola principală trebuie să fie de cel puțin 8 caractere."
+    "message": "Parola principală trebuie să aibă cel puțin 8 caractere."
   },
   "masterPassDoesntMatch": {
     "message": "Confirmarea parolei principale nu se potrivește."
   },
   "newAccountCreated": {
-    "message": "Contul a fost creat! Acum vă puteţi autentifica."
+    "message": "Contul a fost creat! Acum vă puteți autentifica."
   },
   "masterPassSent": {
     "message": "V-am trimis un e-mail cu indiciul parolei principale."
@@ -527,10 +527,10 @@
     "message": "Continuare"
   },
   "enterVerificationCodeApp": {
-    "message": "Introduceţi codul de verificare din 6 cifre din aplicaţia de autentificare."
+    "message": "Introduceți codul de verificare din 6 cifre din aplicația de autentificare."
   },
   "enterVerificationCodeEmail": {
-    "message": "Introduceţi codul de verificare din 6 cifre, care a fost trimis prin e-mail la $EMAIL$.",
+    "message": "Introduceți codul de verificare din 6 cifre, care a fost trimis prin e-mail la $EMAIL$.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -551,7 +551,7 @@
     "message": "Memorizare"
   },
   "sendVerificationCodeEmailAgain": {
-    "message": "Trimitere e-mail cu codul de verificare din nou"
+    "message": "Trimiteți din nou un e-mail cu codul de verificare"
   },
   "useAnotherTwoStepMethod": {
     "message": "Utilizaţi o altă metodă de autentificare în două etape"
@@ -563,34 +563,34 @@
     "message": "Introduceți cheia de securitate în portul USB al computerului. Dacă are un buton, atingeți-l."
   },
   "recoveryCodeDesc": {
-    "message": "Ai pierdut accesul la toți furnizorii de autentificare în doi paşi? Utilizați codul de recuperare pentru a dezactiva toți furnizorii de autentificare în doi paşi din contul dvs."
+    "message": "Ați pierdut accesul la toți furnizorii 2FA-autentificare în doi pași? Utilizați codul de recuperare pentru a dezactiva toți furnizorii 2FA din contul dvs."
   },
   "recoveryCodeTitle": {
     "message": "Cod de recuperare"
   },
   "authenticatorAppTitle": {
-    "message": "Aplicaţie de autentificare"
+    "message": "Aplicație de autentificare"
   },
   "authenticatorAppDesc": {
-    "message": "Utilizaţi o aplicaţie de autentificare (cum ar fi Authy sau Google Authenticator) pentru a genera codurile de verificare bazate de timp.",
+    "message": "Utilizați o aplicație de autentificare (cum ar fi Authy sau Google Authenticator) pentru a genera codurile de verificare bazate de timp.",
     "description": "'Authy' and 'Google Authenticator' are product names and should not be translated."
   },
   "yubiKeyTitle": {
     "message": "Cheie de securitate YubiKey OTP"
   },
   "yubiKeyDesc": {
-    "message": "Utilizați un YubiKey pentru a accesa contul dvs. Funcționează cu dispozitivele YubiKey 4, 4 Nano, 4C și NEO."
+    "message": "Utilizați un YubiKey pentru a vă accesa contul. Merge cu dispozitivele YubiKey 4, 4 Nano, 4C și NEO."
   },
   "duoDesc": {
     "message": "Verificați cu Duo Security utilizând aplicația Duo Mobile, SMS, apel sau cheia de securitate U2F.",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "duoOrganizationDesc": {
-    "message": "Verificați cu Duo Security pentru organizaţia dvs. utilizând aplicația Duo Mobile, SMS, apel telefonic sau cheia de securitate U2F.",
+    "message": "Verificați cu Duo Security pentru organizația dvs. utilizând aplicația Duo Mobile, SMS, apel telefonic sau cheia de securitate U2F.",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "u2fDesc": {
-    "message": "Utilizați orice cheie de securitate activată FIDO U2F pentru a accesa contul dvs."
+    "message": "Utilizați orice cheie de securitate activată FIDO U2F pentru a vă accesa contul."
   },
   "u2fTitle": {
     "message": "Cheie de securitate FIDO U2F"
@@ -599,7 +599,7 @@
     "message": "E-mail"
   },
   "emailDesc": {
-    "message": "Codurile de verificare vor fi trimise prin e-mail."
+    "message": "Veți primi prin e-mail codurile de verificare."
   },
   "loginUnavailable": {
     "message": "Login indisponibil"
@@ -611,13 +611,13 @@
     "message": "Adăugați furnizori suplimentari care sunt mai bine susținuți pe toate dispozitivele (cum ar fi o aplicație de autentificare)."
   },
   "twoStepOptions": {
-    "message": "Opţiuni autentificare în două etape"
+    "message": "Opțiuni autentificare în două etape"
   },
   "selfHostedEnvironment": {
     "message": "Mediu de găzduire personal"
   },
   "selfHostedEnvironmentFooter": {
-    "message": "Specificați URL-ul implementări locale, personale a bitwarden."
+    "message": "Specificați URL-ul de bază al instalării Bitwarden găzduită local."
   },
   "customEnvironment": {
     "message": "Mediu personalizat"
@@ -632,19 +632,19 @@
     "message": "URL server API"
   },
   "webVaultUrl": {
-    "message": "URL seif web"
+    "message": "URL server seif Web"
   },
   "identityUrl": {
     "message": "URL server de identificare"
   },
   "notificationsUrl": {
-    "message": "Notifications Server URL"
+    "message": "URL-ul serverului de notificări"
   },
   "iconsUrl": {
-    "message": "URL server de pictograme"
+    "message": "URL server de iconuri"
   },
   "environmentSaved": {
-    "message": "URL-urile mediului bitwarden au fost salvate."
+    "message": "URL-urile mediului Bitwarden au fost salvate."
   },
   "ok": {
     "message": "Ok"
@@ -677,7 +677,7 @@
     "message": "Deconectare"
   },
   "addNewLogin": {
-    "message": "Adăugare autentificare nouă"
+    "message": "Adăugare conectare nouă"
   },
   "addNewItem": {
     "message": "Adăugare element nou"
@@ -686,7 +686,7 @@
     "message": "Adăugare dosar nou"
   },
   "view": {
-    "message": "Vizualizare"
+    "message": "Afișare"
   },
   "account": {
     "message": "Cont"
@@ -701,7 +701,7 @@
     "message": "Generator de parole"
   },
   "emailUs": {
-    "message": "Trimiteți-ne un e-mail"
+    "message": "Contactează-ne"
   },
   "visitOurWebsite": {
     "message": "Vizitați-ne site-ul web"
@@ -716,30 +716,30 @@
     "message": "Urmăriți-ne"
   },
   "syncVault": {
-    "message": "Sincronizaţi seiful"
+    "message": "Sincronizați seiful"
   },
   "changeMasterPass": {
     "message": "Schimbare parolă principală"
   },
   "changeMasterPasswordConfirmation": {
-    "message": "Puteţi modifica parola principală pe site-ul web bitwarden.com. Doriţi să vizitaţi site-ul acum?"
+    "message": "Puteți schimba parola principală pe seiful web bitwarden.com. Doriți să vizitați site-ul acum?"
   },
   "fingerprintPhrase": {
-    "message": "Fingerprint Phrase",
+    "message": "Frază amprentă",
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "yourAccountsFingerprint": {
-    "message": "Your account's fingerprint phrase",
+    "message": "Fraza amprentă a contului dvs.",
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "goToWebVault": {
-    "message": "Accesaţi seiful web"
+    "message": "Accesați seiful web"
   },
   "getMobileApp": {
-    "message": "Obțineți aplicația pentru mobil"
+    "message": "Obțineți app pentru mobil"
   },
   "getBrowserExtension": {
-    "message": "Obţineţi extensie pentru browser"
+    "message": "Obțineți extensie pentru browser"
   },
   "syncingComplete": {
     "message": "Sincronizare completă"
@@ -748,13 +748,13 @@
     "message": "Sincronizare eșuată"
   },
   "yourVaultIsLocked": {
-    "message": "Seiful dvs. este blocat. Verificaţi parola principală pentru a continua."
+    "message": "Seiful dvs. este blocat. Verificați parola principală pentru a continua."
   },
   "unlock": {
     "message": "Deblocare"
   },
   "loggedInAsOn": {
-    "message": "Logged in as $EMAIL$ on $HOSTNAME$.",
+    "message": "Autentificat ca $EMAIL$ în $HOSTNAME$.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -779,7 +779,7 @@
     "message": "Expirarea seifului"
   },
   "vaultTimeoutDesc": {
-    "message": "Choose when your vault will timeout and perform the selected action."
+    "message": "Alegeți când seiful dvs. va expira și va efectua acțiunea selectată."
   },
   "immediately": {
     "message": "Imediat"
@@ -818,10 +818,10 @@
     "message": "Când sistemul este inactiv"
   },
   "onSleep": {
-    "message": "În repaus"
+    "message": "Când sistemul este în veghe"
   },
   "onLocked": {
-    "message": "La blocarea sistemului"
+    "message": "Când sistemul este blocat"
   },
   "onRestart": {
     "message": "La repornire"
@@ -833,48 +833,48 @@
     "message": "Securitate"
   },
   "clearClipboard": {
-    "message": "Goliţi Clipboardul",
+    "message": "Goliți clipboard-ul",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
   "clearClipboardDesc": {
-    "message": "Şterge automat valorile copiate din clipboard.",
+    "message": "Șterge automat valorile copiate din clipboard.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
   "disableFavicon": {
-    "message": "Dezactivare pictograme"
+    "message": "Dezactivați iconuri de site-uri"
   },
   "disableFaviconDesc": {
-    "message": "Pictogramele oferă o imagine recognoscibilă alături de fiecare element de conectare din seiful dvs."
+    "message": "Iconurile site-urilor oferă o imagine identificabilă lângă fiecare element de conectare din seiful dvs."
   },
   "enableMinToTray": {
     "message": "Minimizare în zona de notificare"
   },
   "enableMinToTrayDesc": {
-    "message": "La minimizarea ferestrei se afișează în schimb o pictogramă în zona de notificare."
+    "message": "La minimizarea ferestrei se afișează în schimb un icon în zona de notificare."
   },
   "enableCloseToTray": {
-    "message": "Close to Tray Icon"
+    "message": "Închide în zona de notificare"
   },
   "enableCloseToTrayDesc": {
-    "message": "La minimizarea ferestrei se afișează în schimb o pictogramă în zona de notificare."
+    "message": "La minimizarea ferestrei afișați în schimb un icon în zona de notificare."
   },
   "enableTray": {
-    "message": "Activare pictogramă în zona de notificare"
+    "message": "Activare icon în zona de notificare"
   },
   "enableTrayDesc": {
     "message": "Afișează mereu o pictogramă în zona de notificare."
   },
   "startToTray": {
-    "message": "Start To Tray Icon"
+    "message": "Pornește în bara de notificări"
   },
   "startToTrayDesc": {
-    "message": "When the application is first started, only show an icon in the system tray."
+    "message": "Când aplicația este pornită pentru prima dată, afișați un icon în bara de notificări."
   },
   "language": {
     "message": "Limbă"
   },
   "languageDesc": {
-    "message": "Schimbă limba utilizată de aplicație. Este necesare restartarea."
+    "message": "Schimbă limba utilizată de aplicație. Este necesară repornirea."
   },
   "theme": {
     "message": "Temă"
@@ -895,7 +895,7 @@
     "description": "Copy to clipboard"
   },
   "checkForUpdates": {
-    "message": "Verificaţi pentru actualizări"
+    "message": "Verificați pentru actualizări"
   },
   "version": {
     "message": "Versiune $VERSION_NUM$",
@@ -910,7 +910,7 @@
     "message": "Reporniți pentru actualizare"
   },
   "restartToUpdateDesc": {
-    "message": "Versiunea $VERSION_NUM$ este gata pentru instare. Trebuie să reporniţi Bitwarden pentru a finaliza instalarea. Doriţi să reporniţi şi să actualizaţi acum?",
+    "message": "Versiunea $VERSION_NUM$ este gata pentru instalare. Trebuie să reporniți Bitwarden pentru a finaliza instalarea. Doriți să reporniți și să actualizați acum?",
     "placeholders": {
       "version_num": {
         "content": "$1",
@@ -922,7 +922,7 @@
     "message": "Actualizare disponibilă"
   },
   "updateAvailableDesc": {
-    "message": "O actualizare a fost găsită. Doriţi s-o descărcaţi acum?"
+    "message": "O actualizare a fost găsită. Doriți să o descărcați acum?"
   },
   "restart": {
     "message": "Repornire"
@@ -931,7 +931,7 @@
     "message": "Mai târziu"
   },
   "noUpdatesAvailable": {
-    "message": "Nu sunt disponibile actualizări în prezent. Utilizaţi cea mai recentă versiune."
+    "message": "În prezent nu sunt disponibile actualizări. Folosiți cea mai recentă versiune."
   },
   "updateError": {
     "message": "Eroare la actualizare"
@@ -957,25 +957,25 @@
     "message": "Administrare abonament"
   },
   "premiumManageAlert": {
-    "message": "Puteţi gestiona apartenenţa pe site-ul web bitwarden.com. Doriţi să vizitaţi site-ul acum?"
+    "message": "Vă puteți gestiona apartenența pe seiful web la bitwarden.com. Doriți să vizitați site-ul acum?"
   },
   "premiumRefresh": {
     "message": "Reîmprospătare apartenență"
   },
   "premiumNotCurrentMember": {
-    "message": "Nu sunteţi în prezent un membru premium."
+    "message": "Nu sunteți în prezent un membru premium."
   },
   "premiumSignUpAndGet": {
-    "message": "Înscrieţi-vă pentru un abonament premium şi obţineţi:"
+    "message": "Înscrieţi-vă pentru un abonament premium și obțineți:"
   },
   "premiumSignUpStorage": {
-    "message": "1 GB pentru stocarea fişierelor criptate."
+    "message": "1 GB pentru stocarea fișierelor criptate."
   },
   "premiumSignUpTwoStep": {
-    "message": "Opțiuni adiţionale de conectare în doi pași, cum ar fi YubiKey, FIDO U2F şi Duo."
+    "message": "Opțiuni adiționale de conectare în doi pași, cum ar fi YubiKey, FIDO U2F și Duo."
   },
   "premiumSignUpReports": {
-    "message": "Password hygiene, account health, and data breach reports to keep your vault safe."
+    "message": "Igiena parolelor, starea contului și rapoarte de scurgere de date pentru a vă menține siguranța seifului."
   },
   "premiumSignUpTotp": {
     "message": "Generatorul codului de verificare TOTP (2FA) pentru autentificările din seif."
@@ -987,16 +987,16 @@
     "message": "Toate caracteristicile premium viitoare. Mai multe în curând!"
   },
   "premiumPurchase": {
-    "message": "Procuraţi un abonament premium"
+    "message": "Cumpărați un abonament Premium"
   },
   "premiumPurchaseAlert": {
-    "message": "Puteţi procura un abonament premium pe site-ul web bitwarden.com. Doriţi să vizitaţi site-ul acum?"
+    "message": "Vă puteți procura un abonament premium pe site-ul bitwarden.com. Doriți să vizitați site-ul acum?"
   },
   "premiumCurrentMember": {
-    "message": "Sunteţi un membru premium!"
+    "message": "Sunteți un membru premium!"
   },
   "premiumCurrentMemberThanks": {
-    "message": "Vă mulţumim pentru susţinerea bitwarden."
+    "message": "Vă mulțumim pentru susținerea Bitwarden."
   },
   "premiumPrice": {
     "message": "Totul pentru doar $PRICE$ /an!",
@@ -1014,11 +1014,11 @@
     "message": "Istoric parole"
   },
   "clear": {
-    "message": "Ştergere",
+    "message": "Ștergere",
     "description": "To clear something out. example: To clear browser history."
   },
   "noPasswordsInList": {
-    "message": "Nu sunt parole în listă."
+    "message": "Nu aveți nicio parolă în listă."
   },
   "undo": {
     "message": "Anulare"
@@ -1027,21 +1027,21 @@
     "message": "Refacere"
   },
   "cut": {
-    "message": "Decupare",
+    "message": "Taie",
     "description": "Cut to clipboard"
   },
   "paste": {
-    "message": "Lipire",
+    "message": "Lipește",
     "description": "Paste from clipboard"
   },
   "selectAll": {
-    "message": "Selecare totală"
+    "message": "Selectați tot"
   },
   "zoomIn": {
     "message": "Mărire"
   },
   "zoomOut": {
-    "message": "Micşorare"
+    "message": "Micșorare"
   },
   "resetZoom": {
     "message": "Resetare Zoom"
@@ -1063,7 +1063,7 @@
     "message": "Zoom"
   },
   "bringAllToFront": {
-    "message": "Aducere tot în faţă",
+    "message": "Aducere tot în față",
     "description": "Bring all windows to front (foreground)"
   },
   "aboutBitwarden": {
@@ -1079,7 +1079,7 @@
     "message": "Ascunde celelalte"
   },
   "showAll": {
-    "message": "Afişare tot"
+    "message": "Afișare tot"
   },
   "quitBitwarden": {
     "message": "Închidere Bitwarden"
@@ -1154,14 +1154,14 @@
     "message": "Ieșire"
   },
   "showHide": {
-    "message": "Afișare/Ascundere",
+    "message": "Afișare / Ascundere",
     "description": "Text for a button that toggles the visibility of the window. Shows the window when it is hidden or hides the window if it is currently open."
   },
   "hideToTray": {
     "message": "Ascundere în zona de notificare"
   },
   "alwaysOnTop": {
-    "message": "Always on Top",
+    "message": "Mereu Deasupra",
     "description": "Application window should always stay on top of other windows"
   },
   "dateUpdated": {
@@ -1192,13 +1192,13 @@
     "message": "You do not belong to any organizations. Organizations allow you to securely share items with other users."
   },
   "noCollectionsInList": {
-    "message": "There are no collections to list."
+    "message": "Nu există colecții în listă."
   },
   "ownership": {
-    "message": "Ownership"
+    "message": "Proprietar"
   },
   "whoOwnsThisItem": {
-    "message": "Who owns this item?"
+    "message": "Cine deține acest articol?"
   },
   "strong": {
     "message": "Puternic",
@@ -1226,55 +1226,55 @@
     "message": "Deblocați cu codul PIN"
   },
   "setYourPinCode": {
-    "message": "Set your PIN code for unlocking Bitwarden. Your PIN settings will be reset if you ever fully log out of the application."
+    "message": "Setați codul PIN de deblocare Bitwarden. Setările codului PIN vor fi resetate dacă vă deconectați vreodată din aplicație."
   },
   "pinRequired": {
-    "message": "PIN code is required."
+    "message": "Codul PIN este necesar."
   },
   "invalidPin": {
     "message": "Cod PIN invalid."
   },
   "yourVaultIsLockedPinCode": {
-    "message": "Your vault is locked. Verify your PIN code to continue."
+    "message": "Seiful dvs. este blocat. Verificați codul PIN pentru a continua."
   },
   "unlockWithWindowsHello": {
-    "message": "Unlock with Windows Hello"
+    "message": "Deblocare cu Windows Hello"
   },
   "windowsHelloConsentMessage": {
-    "message": "Verify for Bitwarden."
+    "message": "Verificați pentru Bitwarden."
   },
   "unlockWithTouchId": {
-    "message": "Unlock with Touch ID"
+    "message": "Deblocare cu Touch ID"
   },
   "touchIdConsentMessage": {
-    "message": "Verify for Bitwarden."
+    "message": "Verificați pentru Bitwarden."
   },
   "lockWithMasterPassOnRestart": {
-    "message": "Lock with master password on restart"
+    "message": "Blocați cu parola principală la repornire"
   },
   "preferences": {
     "message": "Preferințe"
   },
   "enableMenuBar": {
-    "message": "Enable Menu Bar Icon"
+    "message": "Icon în Bara de Activități"
   },
   "enableMenuBarDesc": {
-    "message": "Always show an icon in the menu bar."
+    "message": "Arată mereu un icon în Bara de Activități."
   },
   "hideToMenuBar": {
-    "message": "Ascunde în bara de meniu"
+    "message": "Ascunde în Bara de Activități"
   },
   "selectOneCollection": {
-    "message": "You must select at least one collection."
+    "message": "Trebuie să selectați cel puțin o colecție."
   },
   "premiumUpdated": {
-    "message": "You've upgraded to premium."
+    "message": "Ați actualizat la Premium."
   },
   "restore": {
     "message": "Restaurați"
   },
   "premiumManageAlertAppStore": {
-    "message": "You can manage your subscription from the App Store. Do you want to visit the App Store now?"
+    "message": "Vă puteți gestiona abonamentul din App Store. Doriți să vizitați App Store acum?"
   },
   "legal": {
     "message": "Legal",
@@ -1287,7 +1287,7 @@
     "message": "Politica Intimității"
   },
   "unsavedChangesConfirmation": {
-    "message": "Are you sure you want to leave? If you leave now then your current information will not be saved."
+    "message": "Sunteți sigur că vreți să plecați? Dacă plecați acum, informațiile dvs. curente nu vor fi salvate."
   },
   "unsavedChangesTitle": {
     "message": "Modificări nesalvate"
@@ -1296,16 +1296,16 @@
     "message": "Clonare"
   },
   "passwordGeneratorPolicyInEffect": {
-    "message": "One or more organization policies are affecting your generator settings."
+    "message": "Una sau mai multe politici organizaționale vă afectează setările generatorului."
   },
   "vaultTimeoutAction": {
     "message": "Acțiune la expirarea seifului"
   },
   "vaultTimeoutActionLockDesc": {
-    "message": "A locked vault requires that you re-enter your master password to access it again."
+    "message": "Un seif blocat necesită reintroducerea parolei principale pentru a-l accesa din nou."
   },
   "vaultTimeoutActionLogOutDesc": {
-    "message": "A logged out vault requires that you re-authenticate to access it again."
+    "message": "Un seif deconectat necesită reintroducerea parolei principale pentru a-l accesa din nou."
   },
   "lock": {
     "message": "Blocare",
@@ -1316,55 +1316,55 @@
     "description": "Noun: a special folder to hold deleted items"
   },
   "searchTrash": {
-    "message": "Search trash"
+    "message": "Căutați în trash"
   },
   "permanentlyDeleteItem": {
-    "message": "Permanently Delete Item"
+    "message": "Șterge permanent elementul"
   },
   "permanentlyDeleteItemConfirmation": {
-    "message": "Are you sure you want to permanently delete this item?"
+    "message": "Sigur doriți să ștergeți permanent acest articol?"
   },
   "permanentlyDeletedItem": {
-    "message": "Permanently Deleted item"
+    "message": "Articol șters permanent"
   },
   "restoreItem": {
-    "message": "Restore Item"
+    "message": "Restabiliți articolul"
   },
   "restoreItemConfirmation": {
-    "message": "Are you sure you want to restore this item?"
+    "message": "Sigur doriți să restaurați acest articol?"
   },
   "restoredItem": {
-    "message": "Restored Item"
+    "message": "Articol restaurat"
   },
   "permanentlyDelete": {
-    "message": "Permanently Delete"
+    "message": "Ștergeți permanent"
   },
   "vaultTimeoutLogOutConfirmation": {
-    "message": "Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?"
+    "message": "Deconectarea va elimina accesul la seiful dvs. și necesită autentificare online după perioada de expirare. Sunteți sigur că doriți să utilizați această setare?"
   },
   "vaultTimeoutLogOutConfirmationTitle": {
-    "message": "Timeout Action Confirmation"
+    "message": "Confirmare acțiune la expirare"
   },
   "enterpriseSingleSignOn": {
-    "message": "Enterprise Single Sign-On"
+    "message": "Identificare unică antrepriză (SSO)"
   },
   "setMasterPassword": {
-    "message": "Set Master Password"
+    "message": "Setați parola principală"
   },
   "ssoCompleteRegistration": {
-    "message": "In order to complete logging in with SSO, please set a master password to access and protect your vault."
+    "message": "Pentru a finaliza conectarea cu SSO, vă rugăm să setați o parolă principală pentru a accesa și a vă proteja seiful."
   },
   "newMasterPass": {
-    "message": "New Master Password"
+    "message": "Noua parolă principală"
   },
   "confirmNewMasterPass": {
-    "message": "Confirm New Master Password"
+    "message": "Confirmați noua parolă principală"
   },
   "masterPasswordPolicyInEffect": {
-    "message": "One or more organization policies require your master password to meet the following requirements:"
+    "message": "Una sau mai multe politici ale organizației necesită ca parola principală să îndeplinească următoarele cerințe:"
   },
   "policyInEffectMinComplexity": {
-    "message": "Minimum complexity score of $SCORE$",
+    "message": "Scor minim de complexitate de $SCORE$",
     "placeholders": {
       "score": {
         "content": "$1",
@@ -1373,7 +1373,7 @@
     }
   },
   "policyInEffectMinLength": {
-    "message": "Minimum length of $LENGTH$",
+    "message": "Lungime minimă de $LENGTH$",
     "placeholders": {
       "length": {
         "content": "$1",
@@ -1382,16 +1382,16 @@
     }
   },
   "policyInEffectUppercase": {
-    "message": "Contain one or more uppercase characters"
+    "message": "Conține unul sau mai multe caractere majuscule"
   },
   "policyInEffectLowercase": {
-    "message": "Contain one or more lowercase characters"
+    "message": "Conține unul sau mai multe caractere minuscule"
   },
   "policyInEffectNumbers": {
-    "message": "Contain one or more numbers"
+    "message": "Conține unul sau mai multe numere"
   },
   "policyInEffectSpecial": {
-    "message": "Contain one or more of the following special characters $CHARS$",
+    "message": "Conține unul sau mai multe din următoarele caractere: $CHARS$",
     "placeholders": {
       "chars": {
         "content": "$1",
@@ -1400,12 +1400,12 @@
     }
   },
   "masterPasswordPolicyRequirementsNotMet": {
-    "message": "Your new master password does not meet the policy requirements."
+    "message": "Noua dvs. parolă principală nu îndeplinește cerințele politicii."
   },
   "acceptPolicies": {
-    "message": "By checking this box you agree to the following:"
+    "message": "Bifând această casetă sunteți de acord cu următoarele:"
   },
   "acceptPoliciesError": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "Termenii Serviciului și Politica Intimității nu au fost recunoscute."
   }
 }
diff --git a/src/locales/ru/messages.json b/src/locales/ru/messages.json
index 173e9da610..0e836c90e3 100644
--- a/src/locales/ru/messages.json
+++ b/src/locales/ru/messages.json
@@ -1403,9 +1403,9 @@
     "message": "Ваш новый мастер-пароль не соответствует требованиям политики."
   },
   "acceptPolicies": {
-    "message": "By checking this box you agree to the following:"
+    "message": "Устанавливая этот флажок, вы соглашаетесь со следующим:"
   },
   "acceptPoliciesError": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "Условия предоставления услуг и Политика конфиденциальности не были подтверждены."
   }
 }
diff --git a/src/locales/sk/messages.json b/src/locales/sk/messages.json
index 29d91e7a41..9344e81b85 100644
--- a/src/locales/sk/messages.json
+++ b/src/locales/sk/messages.json
@@ -51,7 +51,7 @@
     "message": "Položka zdieľaná"
   },
   "shareDesc": {
-    "message": "Vyberte organizáciu, s ktorou chcete zdieľať túto položku. Zdieľanie presunie vlastníctvo položky na organizáciu. Po zdieľaní už nebudete priamy vlastník položky."
+    "message": "Vyberte organizáciu, s ktorou chcete zdieľať túto položku. Zdieľanie presunie vlastníctvo položky na organizáciu. Po zdieľaní už nebudete priamym vlastníkom danej položky."
   },
   "attachments": {
     "message": "Prílohy"
@@ -109,7 +109,7 @@
     "message": "Spustiť"
   },
   "copyValue": {
-    "message": "Kopírovať hodnotu",
+    "message": "Skopírovať hodnotu",
     "description": "Copy value to clipboard"
   },
   "minimizeOnCopyToClipboard": {
@@ -135,7 +135,7 @@
     "message": "Značka"
   },
   "expiration": {
-    "message": "Expirácia"
+    "message": "Exspirácia"
   },
   "securityCode": {
     "message": "Bezpečnostný kód"
@@ -232,10 +232,10 @@
     "message": "Dr."
   },
   "expirationMonth": {
-    "message": "Mesiac expirácie"
+    "message": "Mesiac exspirácie"
   },
   "expirationYear": {
-    "message": "Rok expirácie"
+    "message": "Rok exspirácie"
   },
   "select": {
     "message": "Vybrať"
@@ -377,7 +377,7 @@
     "message": "Oddeľovač slov"
   },
   "capitalize": {
-    "message": "Prvé písmeno veľkým",
+    "message": "Veľké prvé písmená slov",
     "description": "Make the first letter of a work uppercase."
   },
   "includeNumber": {
@@ -387,10 +387,10 @@
     "message": "Zavrieť"
   },
   "minNumbers": {
-    "message": "Minimum číslic"
+    "message": "Minimálny počet číslic"
   },
   "minSpecial": {
-    "message": "Minimum špec. znakov",
+    "message": "Minimum špeciálnych",
     "description": "Minimum Special Characters"
   },
   "ambiguous": {
@@ -431,7 +431,7 @@
     "message": "Maximálna veľkosť súboru je 100 MB."
   },
   "updateKey": {
-    "message": "Túto funkciu nemožno použiť, kým neaktualizujete svoj šifrovací kľúč."
+    "message": "Túto funkciu je možné použiť, až keď si aktualizujete svoj šifrovací kľúč."
   },
   "options": {
     "message": "Možnosti"
@@ -449,7 +449,7 @@
     "message": "Priečinok odstránený"
   },
   "loginOrCreateNewAccount": {
-    "message": "Prihláste sa, alebo vytvorte nový účet pre prístup k vášmu bezpečnému trezoru."
+    "message": "Prihláste sa alebo si vytvorte nový účet, aby ste mohli pristupovať k vášmu bezpečnému trezoru."
   },
   "createAccount": {
     "message": "Vytvoriť účet"
@@ -464,7 +464,7 @@
     "message": "Hlavné heslo"
   },
   "masterPassDesc": {
-    "message": "Hlavné heslo je heslo, ktoré použijete na prístup k svojmu trezoru. Je veľmi dôležité, aby ste svoje hlavné heslo nezabudli. Neexistuje možnosť, ako heslo obnoviť v prípade, že ho zabudnete."
+    "message": "Hlavné heslo je heslo, ktoré používate na prístup k svojmu trezoru. Je veľmi dôležité, aby ste svoje hlavné heslo nezabudli. Neexistuje možnosť ako heslo obnoviť v prípade, že ho zabudnete."
   },
   "masterPassHintDesc": {
     "message": "Nápoveď k hlavnému heslu vám môže pomôcť spomenúť si na heslo, ak ho zabudnete."
@@ -566,7 +566,7 @@
     "message": "Stratili ste prístup ku všetkým vašim dvojstupňovým poskytovateľom? Použite váš záchranný kód pre vypnutie všetkých poskytovateľov vo vašom účte."
   },
   "recoveryCodeTitle": {
-    "message": "Záchranný kód"
+    "message": "Kód na obnovenie"
   },
   "authenticatorAppTitle": {
     "message": "Overovacia aplikácia"
@@ -582,7 +582,7 @@
     "message": "Použiť YubiKey pre prístup k vášmu účtu. Pracuje s YubiKey 4, 4 Nano, 4C a s NEO zariadeniami."
   },
   "duoDesc": {
-    "message": "Overiť s Duo Security použitím Duo Mobile aplikácie, SMS, telefonátu alebo U2F bezpečnostným kľúčom.",
+    "message": "Overiť sa prostredníctvom Duo Security použitím Duo Mobile aplikácie, SMS, telefonátu alebo U2F bezpečnostným kľúčom.",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "duoOrganizationDesc": {
@@ -677,7 +677,7 @@
     "message": "Odhlásiť sa"
   },
   "addNewLogin": {
-    "message": "Pridať prihlasovacie údaje"
+    "message": "Pridať nové prihlasovacie údaje"
   },
   "addNewItem": {
     "message": "Pridať novú položku"
@@ -779,7 +779,7 @@
     "message": "Časový limit pre trezor"
   },
   "vaultTimeoutDesc": {
-    "message": "Vyberte kedy vyprší časový limit trezora a vykoná sa zvolená akcia."
+    "message": "Vyberte, kedy vyprší časový limit trezora a vykoná sa zvolená akcia."
   },
   "immediately": {
     "message": "Okamžite"
@@ -880,7 +880,7 @@
     "message": "Motív"
   },
   "themeDesc": {
-    "message": "Zmeniť motív aplikácie."
+    "message": "Zmeniť farebný motív aplikácie."
   },
   "dark": {
     "message": "Tmavý",
@@ -1035,7 +1035,7 @@
     "description": "Paste from clipboard"
   },
   "selectAll": {
-    "message": "Vybrať Všetko"
+    "message": "Označiť všetko"
   },
   "zoomIn": {
     "message": "Priblížiť"
@@ -1095,7 +1095,7 @@
     }
   },
   "help": {
-    "message": "Pomoc"
+    "message": "Nápoveď"
   },
   "window": {
     "message": "Okno"
@@ -1104,7 +1104,7 @@
     "message": "Overiť či došlo k úniku hesla."
   },
   "passwordExposed": {
-    "message": "Toto heslo uniklo $VALUE$ krát v dátových únikoch. Mali by ste ho zmeniť.",
+    "message": "Toto heslo uniklo $VALUE$-krát v dátových únikoch. Mali by ste ho zmeniť.",
     "placeholders": {
       "value": {
         "content": "$1",
@@ -1241,13 +1241,13 @@
     "message": "Odomknúť pomocou Windows Hello"
   },
   "windowsHelloConsentMessage": {
-    "message": "Verify for Bitwarden."
+    "message": "Overiť pre Bitwarden."
   },
   "unlockWithTouchId": {
     "message": "Odomknúť s Touch ID"
   },
   "touchIdConsentMessage": {
-    "message": "Verify for Bitwarden."
+    "message": "Overiť pre Bitwarden."
   },
   "lockWithMasterPassOnRestart": {
     "message": "Pri reštarte zamknúť s hlavným heslom"
@@ -1403,9 +1403,9 @@
     "message": "Vaše nové hlavné heslo nespĺňa pravidlá."
   },
   "acceptPolicies": {
-    "message": "By checking this box you agree to the following:"
+    "message": "Označením tohto políčka súhlasíte s nasledovným:"
   },
   "acceptPoliciesError": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "Neboli akceptované Podmienky používania a zásady Ochrany osobných údajov."
   }
 }
diff --git a/src/locales/sr/messages.json b/src/locales/sr/messages.json
index bec0cfe1c5..1bf1a5f95e 100644
--- a/src/locales/sr/messages.json
+++ b/src/locales/sr/messages.json
@@ -51,7 +51,7 @@
     "message": "Ставка дељена"
   },
   "shareDesc": {
-    "message": "Choose an organization that you wish to share this item with. Sharing transfers ownership of the item to the organization. You will no longer be the direct owner of this item once it has been shared."
+    "message": "Изаберите организацију са којом желите да делите ову ставку. Дељење преноси власништво предмета на организацију. Више нећете бити директни власник ове ставке када се она дели."
   },
   "attachments": {
     "message": "Прилози"
@@ -394,7 +394,7 @@
     "description": "Minimum Special Characters"
   },
   "ambiguous": {
-    "message": "Avoid Ambiguous Characters"
+    "message": "Избегавајте двосмислене знакове"
   },
   "searchCollection": {
     "message": "Претражи колекцију"
@@ -446,91 +446,91 @@
     "message": "Сигурно обрисати ову фасциклу?"
   },
   "deletedFolder": {
-    "message": "Deleted folder"
+    "message": "Фасцикла обрисана"
   },
   "loginOrCreateNewAccount": {
-    "message": "Log in or create a new account to access your secure vault."
+    "message": "Пријавите се или креирајте нови налог за приступ Сефу."
   },
   "createAccount": {
-    "message": "Create Account"
+    "message": "Креирај налог"
   },
   "logIn": {
-    "message": "Log In"
+    "message": "Пријавите се"
   },
   "submit": {
-    "message": "Submit"
+    "message": "Пошаљи"
   },
   "masterPass": {
-    "message": "Master Password"
+    "message": "Главна Лозинка"
   },
   "masterPassDesc": {
-    "message": "The master password is the password you use to access your vault. It is very important that you do not forget your master password. There is no way to recover the password in the event that you forget it."
+    "message": "Главна Лозинка је лозинка коју користите за приступ Вашем сефу. Врло је важно да је не заборавите. Не постоји начин да повратите лозинку у случају да је заборавите."
   },
   "masterPassHintDesc": {
-    "message": "A master password hint can help you remember your password if you forget it."
+    "message": "Савет Главне Лозинке може да Вам помогне да се је потсетите ако је заборавите."
   },
   "reTypeMasterPass": {
-    "message": "Re-type Master Password"
+    "message": "Поновити Главну Лозинку"
   },
   "masterPassHint": {
-    "message": "Master Password Hint (optional)"
+    "message": "Савет Главне Лозинке (опционо)"
   },
   "settings": {
-    "message": "Settings"
+    "message": "Подешавања"
   },
   "passwordHint": {
-    "message": "Password Hint"
+    "message": "Помоћ за лозинку"
   },
   "enterEmailToGetHint": {
-    "message": "Enter your account email address to receive your master password hint."
+    "message": "Унесите Ваш имејл да би добили савет за Вашу Главну Лозинку."
   },
   "getMasterPasswordHint": {
-    "message": "Get master password hint"
+    "message": "Добити савет за Главну Лозинку"
   },
   "emailRequired": {
-    "message": "Email address is required."
+    "message": "Имејл је неопходан."
   },
   "invalidEmail": {
-    "message": "Invalid email address."
+    "message": "Неисправан имејл."
   },
   "masterPassRequired": {
-    "message": "Master password is required."
+    "message": "Главна Лозинка је неопходна."
   },
   "masterPassLength": {
-    "message": "Master password must be at least 8 characters long."
+    "message": "Главна Лозинка треба имати бар 8 знака."
   },
   "masterPassDoesntMatch": {
-    "message": "Master password confirmation does not match."
+    "message": "Потврђена Главна Лозинка се не подудара."
   },
   "newAccountCreated": {
-    "message": "Your new account has been created! You may now log in."
+    "message": "Ваш налог је креиран! Сада се можте пријавити."
   },
   "masterPassSent": {
-    "message": "We've sent you an email with your master password hint."
+    "message": "Послали смо Вам поруку са саветом главне лозинке."
   },
   "unexpectedError": {
-    "message": "An unexpected error has occurred."
+    "message": "Дошло је до неочекиване грешке."
   },
   "itemInformation": {
-    "message": "Item Information"
+    "message": "Ставка Информације"
   },
   "noItemsInList": {
-    "message": "There are no items to list."
+    "message": "Нама ставке у листи."
   },
   "verificationCode": {
-    "message": "Verification Code"
+    "message": "Верификациони код"
   },
   "verificationCodeRequired": {
-    "message": "Verification code is required."
+    "message": "Верификациони код је обавезан."
   },
   "continue": {
-    "message": "Continue"
+    "message": "Настави"
   },
   "enterVerificationCodeApp": {
-    "message": "Enter the 6 digit verification code from your authenticator app."
+    "message": "Унесите шестоцифрени верификациони код из апликације за утврђивање аутентичности."
   },
   "enterVerificationCodeEmail": {
-    "message": "Enter the 6 digit verification code that was emailed to $EMAIL$.",
+    "message": "Унесите шестоцифрени верификациони код који је послан на $EMAIL$.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -539,7 +539,7 @@
     }
   },
   "verificationCodeEmailSent": {
-    "message": "Verification email sent to $EMAIL$.",
+    "message": "Провера имејла послата на $EMAIL$.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -548,82 +548,82 @@
     }
   },
   "rememberMe": {
-    "message": "Remember me"
+    "message": "Запамти ме"
   },
   "sendVerificationCodeEmailAgain": {
-    "message": "Send verification code email again"
+    "message": "Поново послати верификациони код на имејл"
   },
   "useAnotherTwoStepMethod": {
-    "message": "Use another two-step login method"
+    "message": "Користите другу методу пријављивања у два корака"
   },
   "insertYubiKey": {
-    "message": "Insert your YubiKey into your computer's USB port, then touch its button."
+    "message": "Убаците свој YubiKey у УСБ порт рачунара, а затим додирните његово дугме."
   },
   "insertU2f": {
-    "message": "Insert your security key into your computer's USB port. If it has a button, touch it."
+    "message": "Убаците свој сигурносни кључ у УСБ порт рачунара, и ако има дугме , додирните га."
   },
   "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to disable all two-factor providers from your account."
+    "message": "Изгубили сте приступ свим својим двофакторским добављачима? Употребите код за опоравак да онемогућите све двофакторске добављаче из налога."
   },
   "recoveryCodeTitle": {
-    "message": "Recovery Code"
+    "message": "Шифра за опоравак"
   },
   "authenticatorAppTitle": {
-    "message": "Authenticator App"
+    "message": "Апликација Аутентификатор"
   },
   "authenticatorAppDesc": {
-    "message": "Use an authenticator app (such as Authy or Google Authenticator) to generate time-based verification codes.",
+    "message": "Користите апликацију за аутентификацију (као што је Authy или Google Authenticator) за генерисање верификационих кодова.",
     "description": "'Authy' and 'Google Authenticator' are product names and should not be translated."
   },
   "yubiKeyTitle": {
-    "message": "YubiKey OTP Security Key"
+    "message": "YubiKey OTP сигурносни кључ"
   },
   "yubiKeyDesc": {
-    "message": "Use a YubiKey to access your account. Works with YubiKey 4, 4 Nano, 4C, and NEO devices."
+    "message": "Користите YubiKey за приступ налогу. Ради са YubiKey 4, 4 Nano, 4C, и NEO уређаје."
   },
   "duoDesc": {
-    "message": "Verify with Duo Security using the Duo Mobile app, SMS, phone call, or U2F security key.",
+    "message": "Провери са Duo Security користећи Duo Mobile апликацију, СМС, телефонски позив, или U2F кључ.",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "duoOrganizationDesc": {
-    "message": "Verify with Duo Security for your organization using the Duo Mobile app, SMS, phone call, or U2F security key.",
+    "message": "Провери са Duo Security за вашу организацију користећи Duo Mobile апликацију, СМС, телефонски позив, или U2F кључ.",
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "u2fDesc": {
-    "message": "Use any FIDO U2F enabled security key to access your account."
+    "message": "Користите било који FIDO U2F сигурносни кључ за присту налога."
   },
   "u2fTitle": {
-    "message": "FIDO U2F Security Key"
+    "message": "FIDO U2F сигурносни кључ"
   },
   "emailTitle": {
-    "message": "Email"
+    "message": "Имејл"
   },
   "emailDesc": {
-    "message": "Verification codes will be emailed to you."
+    "message": "Верификациони кодови ће вам бити послати имејлом."
   },
   "loginUnavailable": {
-    "message": "Login Unavailable"
+    "message": "Пријава недоступна"
   },
   "noTwoStepProviders": {
-    "message": "This account has two-step login enabled, however, none of the configured two-step providers are supported by this device."
+    "message": "Овај налог има омогућено пријављивање у два корака, међутим уређај не подржава ниједног од конфигурисаних добављача."
   },
   "noTwoStepProviders2": {
-    "message": "Please add additional providers that are better supported across devices (such as an authenticator app)."
+    "message": "Додајте додатне добављаче који су боље подржани на свим уређајима (као што је апликација за утврђивање аутентичности)."
   },
   "twoStepOptions": {
     "message": "Опције дво-коракне пријаве"
   },
   "selfHostedEnvironment": {
-    "message": "Self-hosted Environment"
+    "message": "Самостално окружење"
   },
   "selfHostedEnvironmentFooter": {
-    "message": "Specify the base URL of your on-premises hosted Bitwarden installation."
+    "message": "Наведите основни УРЛ вашег локалног инсталиране Bitwarden инсталације."
   },
   "customEnvironment": {
-    "message": "Custom Environment"
+    "message": "Прилагођено окружење"
   },
   "customEnvironmentFooter": {
-    "message": "For advanced users. You can specify the base URL of each service independently."
+    "message": "За напредне кориснике. Можете да одредите независно основни УРЛ сваког сервиса."
   },
   "baseUrl": {
     "message": "УРЛ Сервера"
@@ -644,7 +644,7 @@
     "message": "УРЛ сервера иконице"
   },
   "environmentSaved": {
-    "message": "The environment URLs have been saved."
+    "message": "УРЛ адресе окружења су сачуване."
   },
   "ok": {
     "message": "У реду"
@@ -707,7 +707,7 @@
     "message": "Посети наш веб-сајт"
   },
   "fileBugReport": {
-    "message": "File a Bug Report"
+    "message": "Поднесите извештај о грешци"
   },
   "blog": {
     "message": "Блог"
@@ -722,14 +722,14 @@
     "message": "Промени Главну Лозинку"
   },
   "changeMasterPasswordConfirmation": {
-    "message": "You can change your master password on the bitwarden.com web vault. Do you want to visit the website now?"
+    "message": "Можете променити главну лозинку у Вашем сефу на bitwarden.com. Да ли желите да посетите веб страницу сада?"
   },
   "fingerprintPhrase": {
-    "message": "Фраза отиска прста",
+    "message": "Сигурносна Фраза Сефа",
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "yourAccountsFingerprint": {
-    "message": "Ваша фраза отиска прста за налог",
+    "message": "Ваша Сигурносна Фраза Сефа",
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "goToWebVault": {
@@ -770,7 +770,7 @@
     "message": "Погрешна главна лозинка"
   },
   "twoStepLoginConfirmation": {
-    "message": "Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be enabled on the bitwarden.com web vault. Do you want to visit the website now?"
+    "message": "Пријава у два корака чини ваш рачун сигурнијим захтевом да верификујете своје податке помоћу другог уређаја, као што су безбедносни кључ, апликација, СМС-а, телефонски позив или имејл. Пријављивање у два корака може се омогућити на веб сефу. Да ли желите да посетите веб страницу сада?"
   },
   "twoStepLogin": {
     "message": "Дво-коракна лозинка"
@@ -779,7 +779,7 @@
     "message": "Тајмаут сефа"
   },
   "vaultTimeoutDesc": {
-    "message": "Choose when your vault will timeout and perform the selected action."
+    "message": "Изаберите када ће сеф истећи и да изврши одабрану радњу."
   },
   "immediately": {
     "message": "Одмах"
@@ -850,55 +850,55 @@
     "message": "Умањи у систем трају"
   },
   "enableMinToTrayDesc": {
-    "message": "When minimizing the window, show an icon in the system tray instead."
+    "message": "Када минимизујете прозор, уместо тога покажите икону у системској палети."
   },
   "enableCloseToTray": {
-    "message": "Close to Tray Icon"
+    "message": "Затвори у системску иконицу"
   },
   "enableCloseToTrayDesc": {
-    "message": "When closing the window, show an icon in the system tray instead."
+    "message": "Када затворите прозор, уместо тога покажите икону у системској палети."
   },
   "enableTray": {
-    "message": "Enable Tray Icon"
+    "message": "Омогући икону система"
   },
   "enableTrayDesc": {
-    "message": "Always show an icon in the system tray."
+    "message": "Увек прикажи иконицу на системској траци."
   },
   "startToTray": {
-    "message": "Start To Tray Icon"
+    "message": "Покрени као иконицу"
   },
   "startToTrayDesc": {
-    "message": "When the application is first started, only show an icon in the system tray."
+    "message": "Када се апликација први пут покрене, прикажи је само као икону."
   },
   "language": {
     "message": "Језик"
   },
   "languageDesc": {
-    "message": "Change the language used by the application. Restart is required."
+    "message": "Промените језик који апликација користи. Потребно је поновно покретање."
   },
   "theme": {
-    "message": "Theme"
+    "message": "Тема"
   },
   "themeDesc": {
-    "message": "Change the application's color theme."
+    "message": "Промени боје апликације."
   },
   "dark": {
-    "message": "Dark",
+    "message": "Тамно",
     "description": "Dark color"
   },
   "light": {
-    "message": "Light",
+    "message": "Светло",
     "description": "Light color"
   },
   "copy": {
-    "message": "Copy",
+    "message": "Копирај",
     "description": "Copy to clipboard"
   },
   "checkForUpdates": {
-    "message": "Check For Updates"
+    "message": "Провери верзију програма"
   },
   "version": {
-    "message": "Version $VERSION_NUM$",
+    "message": "Верзија $VERSION_NUM$",
     "placeholders": {
       "version_num": {
         "content": "$1",
@@ -907,10 +907,10 @@
     }
   },
   "restartToUpdate": {
-    "message": "Restart To Update"
+    "message": "Поново покренути за ажурирање"
   },
   "restartToUpdateDesc": {
-    "message": "Version $VERSION_NUM$ is ready to install. You must restart the application to complete the installation. Do you want to restart and update now?",
+    "message": "Верзија $VERSION_NUM$ је спремна за инсталацију. Морате поново покренути апликацију да бисте довршили инсталацију. Да ли желите да поново покренете и ажурирате сада?",
     "placeholders": {
       "version_num": {
         "content": "$1",
@@ -919,87 +919,87 @@
     }
   },
   "updateAvailable": {
-    "message": "Update Available"
+    "message": "Ажурирање је доступно"
   },
   "updateAvailableDesc": {
-    "message": "An update was found. Do you want to download it now?"
+    "message": "Пронађено је ажурирање. Да ли желите да је преузмете сада?"
   },
   "restart": {
-    "message": "Restart"
+    "message": "Поново покрени"
   },
   "later": {
-    "message": "Later"
+    "message": "Касније"
   },
   "noUpdatesAvailable": {
-    "message": "No updates are currently available. You are using the latest version."
+    "message": "Тренутно нису доступна ажурирања. Користите најновију верзију."
   },
   "updateError": {
-    "message": "Update Error"
+    "message": "Грешка при ажурирању"
   },
   "unknown": {
-    "message": "Unknown"
+    "message": "Непознато"
   },
   "copyUsername": {
-    "message": "Copy Username"
+    "message": "Копирај име"
   },
   "copyNumber": {
-    "message": "Copy Number",
+    "message": "Копирај број",
     "description": "Copy credit card number"
   },
   "copySecurityCode": {
-    "message": "Copy Security Code",
+    "message": "Копирај сигурносни код",
     "description": "Copy credit card security code (CVV)"
   },
   "premiumMembership": {
-    "message": "Premium Membership"
+    "message": "Премијум чланство"
   },
   "premiumManage": {
-    "message": "Manage Membership"
+    "message": "Управљање чланством"
   },
   "premiumManageAlert": {
-    "message": "You can manage your membership on the bitwarden.com web vault. Do you want to visit the website now?"
+    "message": "Можете менаџирати Вашу претплату на bitwarden.com. Да ли желите да посетите веб сајт сада?"
   },
   "premiumRefresh": {
-    "message": "Refresh Membership"
+    "message": "Освежите чланство"
   },
   "premiumNotCurrentMember": {
-    "message": "You are not currently a premium member."
+    "message": "Тренутно нисте премиум члан."
   },
   "premiumSignUpAndGet": {
-    "message": "Sign up for a premium membership and get:"
+    "message": "Пријавите се за премиум чланство и добијте:"
   },
   "premiumSignUpStorage": {
-    "message": "1 GB encrypted storage for file attachments."
+    "message": "1ГБ шифровано складиште за прилоге."
   },
   "premiumSignUpTwoStep": {
-    "message": "Additional two-step login options such as YubiKey, FIDO U2F, and Duo."
+    "message": "Додатне опције пријаве у два корака као што су YubiKey, FIDO U2F, и Duo."
   },
   "premiumSignUpReports": {
-    "message": "Password hygiene, account health, and data breach reports to keep your vault safe."
+    "message": "Извештаји о хигијени лозинки, здравственом стању налога и кршењу података да бисте заштитили сеф."
   },
   "premiumSignUpTotp": {
-    "message": "TOTP verification code (2FA) generator for logins in your vault."
+    "message": "Генератор TOTP верификационог кода (2FA) за пријаве из сефа."
   },
   "premiumSignUpSupport": {
-    "message": "Priority customer support."
+    "message": "Приоритетна корисничка подршка."
   },
   "premiumSignUpFuture": {
-    "message": "All future premium features. More coming soon!"
+    "message": "Све будуће премиум функције. Више ускоро!"
   },
   "premiumPurchase": {
     "message": "Купити премијум"
   },
   "premiumPurchaseAlert": {
-    "message": "You can purchase premium membership on the bitwarden.com web vault. Do you want to visit the website now?"
+    "message": "Можете купити премиум претплату на bitwarden.com. Да ли желите да посетите веб сајт сада?"
   },
   "premiumCurrentMember": {
-    "message": "You are a premium member!"
+    "message": "Ви сте премиум члан!"
   },
   "premiumCurrentMemberThanks": {
-    "message": "Thank you for supporting Bitwarden."
+    "message": "Хвала Вам за подршку Bitwarden-а."
   },
   "premiumPrice": {
-    "message": "All for just $PRICE$ /year!",
+    "message": "Све за само $PRICE$ годишње!",
     "placeholders": {
       "price": {
         "content": "$1",
@@ -1158,7 +1158,7 @@
     "description": "Text for a button that toggles the visibility of the window. Shows the window when it is hidden or hides the window if it is currently open."
   },
   "hideToTray": {
-    "message": "Hide to Tray"
+    "message": "Сакриј у систему"
   },
   "alwaysOnTop": {
     "message": "Увек на врху",
@@ -1169,146 +1169,146 @@
     "description": "ex. Date this item was updated"
   },
   "datePasswordUpdated": {
-    "message": "Password Updated",
+    "message": "Лозинка ажурирана",
     "description": "ex. Date this password was updated"
   },
   "exportVault": {
-    "message": "Export Vault"
+    "message": "Извоз сефа"
   },
   "fileFormat": {
-    "message": "File Format"
+    "message": "Формат датотеке"
   },
   "warning": {
-    "message": "WARNING",
+    "message": "УПОЗОРЕЊЕ",
     "description": "WARNING (should stay in capitalized letters if the language permits)"
   },
   "exportWarningDesc": {
-    "message": "This export contains your vault data in an unencrypted format. You should not store or send the exported file over unsecure channels (such as email). Delete it immediately after you are done using it."
+    "message": "Овај извоз садржи податке сефа у нешифрираном формату. Не бисте смели да сачувате или шаљете извезену датотеку преко несигурних канала (као што је имејл). Избришите датотеку одмах након што завршите са коришћењем."
   },
   "exportMasterPassword": {
-    "message": "Enter your master password to export your vault data."
+    "message": "Унети главну лозинку за извиз сефа."
   },
   "noOrganizationsList": {
-    "message": "You do not belong to any organizations. Organizations allow you to securely share items with other users."
+    "message": "Не припадате ниједној организацији. Организације вам омогућавају да безбедно делите ставке са другим корисницима."
   },
   "noCollectionsInList": {
-    "message": "There are no collections to list."
+    "message": "Нема колекције у листи."
   },
   "ownership": {
-    "message": "Ownership"
+    "message": "Власништво"
   },
   "whoOwnsThisItem": {
-    "message": "Who owns this item?"
+    "message": "Ко је власник ове ставке?"
   },
   "strong": {
-    "message": "Strong",
+    "message": "Јако",
     "description": "ex. A strong password. Scale: Weak -> Good -> Strong"
   },
   "good": {
-    "message": "Good",
+    "message": "Добро",
     "description": "ex. A good password. Scale: Weak -> Good -> Strong"
   },
   "weak": {
-    "message": "Weak",
+    "message": "Слабо",
     "description": "ex. A weak password. Scale: Weak -> Good -> Strong"
   },
   "weakMasterPassword": {
-    "message": "Weak Master Password"
+    "message": "Слаба Главна Лозинка"
   },
   "weakMasterPasswordDesc": {
-    "message": "The master password you have chosen is weak. You should use a strong master password (or a passphrase) to properly protect your Bitwarden account. Are you sure you want to use this master password?"
+    "message": "Главна лозинка коју сте одабрали је слаба. Требали бисте користити јаку главну лозинку (или приступну фразу) да бисте правилно заштитили свој налог. Да ли сте сигурни да желите да користите ову главну лозинку?"
   },
   "pin": {
-    "message": "PIN",
+    "message": "ПИН",
     "description": "PIN code. Ex. The short code (often numeric) that you use to unlock a device."
   },
   "unlockWithPin": {
-    "message": "Unlock with PIN"
+    "message": "Деблокирај са ПИН"
   },
   "setYourPinCode": {
-    "message": "Set your PIN code for unlocking Bitwarden. Your PIN settings will be reset if you ever fully log out of the application."
+    "message": "Поставите свој ПИН код за откључавање Bitwarden-а. Поставке ПИН-а ће се ресетовати ако се икада потпуно одјавите из апликације."
   },
   "pinRequired": {
-    "message": "PIN code is required."
+    "message": "ПИН је обавезан."
   },
   "invalidPin": {
-    "message": "Invalid PIN code."
+    "message": "Погрешан ПИН код."
   },
   "yourVaultIsLockedPinCode": {
-    "message": "Your vault is locked. Verify your PIN code to continue."
+    "message": "Сеф је блокиран. Проверити ПИН код за наставак."
   },
   "unlockWithWindowsHello": {
-    "message": "Unlock with Windows Hello"
+    "message": "Деблокирај са Windows Hello"
   },
   "windowsHelloConsentMessage": {
-    "message": "Verify for Bitwarden."
+    "message": "деблокира сеф"
   },
   "unlockWithTouchId": {
-    "message": "Unlock with Touch ID"
+    "message": "Деблокирати са Touch ID"
   },
   "touchIdConsentMessage": {
-    "message": "Verify for Bitwarden."
+    "message": "деблокира сеф"
   },
   "lockWithMasterPassOnRestart": {
-    "message": "Lock with master password on restart"
+    "message": "Закључајте са главном лозинком при поновном покретању"
   },
   "preferences": {
-    "message": "Preferences"
+    "message": "Подешавања"
   },
   "enableMenuBar": {
-    "message": "Enable Menu Bar Icon"
+    "message": "Омогући икону траке менија"
   },
   "enableMenuBarDesc": {
-    "message": "Always show an icon in the menu bar."
+    "message": "Увек покажи икону у траку менија."
   },
   "hideToMenuBar": {
-    "message": "Hide to Menu Bar"
+    "message": "Сакриј у траку менија"
   },
   "selectOneCollection": {
-    "message": "You must select at least one collection."
+    "message": "Морате одабрати макар једну колекцију."
   },
   "premiumUpdated": {
-    "message": "You've upgraded to premium."
+    "message": "Надоградили сте на премиум."
   },
   "restore": {
-    "message": "Restore"
+    "message": "Поврати"
   },
   "premiumManageAlertAppStore": {
-    "message": "You can manage your subscription from the App Store. Do you want to visit the App Store now?"
+    "message": "Претплатом можете управљати из App Store. Да ли желите да посетите App Store сада?"
   },
   "legal": {
-    "message": "Legal",
+    "message": "Правне информације",
     "description": "Noun. As in 'legal documents', like our terms of service and privacy policy."
   },
   "termsOfService": {
-    "message": "Terms of Service"
+    "message": "Услови коришћења услуге"
   },
   "privacyPolicy": {
-    "message": "Privacy Policy"
+    "message": "Политика приватности"
   },
   "unsavedChangesConfirmation": {
-    "message": "Are you sure you want to leave? If you leave now then your current information will not be saved."
+    "message": "Јесте ли сигурни да желите да одете? Ако одете сада, ваше тренутне информације неће бити сачуване."
   },
   "unsavedChangesTitle": {
-    "message": "Unsaved Changes"
+    "message": "Несачуване промене"
   },
   "clone": {
-    "message": "Clone"
+    "message": "Клонирај"
   },
   "passwordGeneratorPolicyInEffect": {
-    "message": "One or more organization policies are affecting your generator settings."
+    "message": "Једна или више смерница организације утичу на поставке вашег генератора."
   },
   "vaultTimeoutAction": {
-    "message": "Vault Timeout Action"
+    "message": "Акција на тајмаут сефа"
   },
   "vaultTimeoutActionLockDesc": {
-    "message": "A locked vault requires that you re-enter your master password to access it again."
+    "message": "Закључани сеф захтева да поново унесете главну лозинку да бисте му поново приступили."
   },
   "vaultTimeoutActionLogOutDesc": {
-    "message": "A logged out vault requires that you re-authenticate to access it again."
+    "message": "Одјављени сеф захтева да поново потврдите идентитет да бисте му поново приступили."
   },
   "lock": {
-    "message": "Lock",
+    "message": "Закључај",
     "description": "Verb form: to make secure or inaccesible by"
   },
   "trash": {
@@ -1340,19 +1340,19 @@
     "message": "Трајно избрисати"
   },
   "vaultTimeoutLogOutConfirmation": {
-    "message": "Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?"
+    "message": "Одјава ће уклонити сваки приступ вашем сефу и захтева мрежну потврду идентитета након истека тајмаута. Да ли сте сигурни да желите да користите ову поставку?"
   },
   "vaultTimeoutLogOutConfirmationTitle": {
-    "message": "Timeout Action Confirmation"
+    "message": "Потврда акције тајмаута"
   },
   "enterpriseSingleSignOn": {
-    "message": "Enterprise Single Sign-On"
+    "message": "Enterprise Једна Пријава"
   },
   "setMasterPassword": {
     "message": "Постави Главну Лозинку"
   },
   "ssoCompleteRegistration": {
-    "message": "In order to complete logging in with SSO, please set a master password to access and protect your vault."
+    "message": "Да бисте довршили пријављивање помоћу SSO, молимо да поставите главну лозинку за приступ и заштиту вашег сефа."
   },
   "newMasterPass": {
     "message": "Нова Главна Лозинка"
@@ -1361,10 +1361,10 @@
     "message": "Потрдити нову Главну Лозинку"
   },
   "masterPasswordPolicyInEffect": {
-    "message": "One or more organization policies require your master password to meet the following requirements:"
+    "message": "Једна или више смерница организације захтевају да ваша главна лозинка да би испуњавали следеће захтеве:"
   },
   "policyInEffectMinComplexity": {
-    "message": "Minimum complexity score of $SCORE$",
+    "message": "Оцена минималне сложености од $SCORE$",
     "placeholders": {
       "score": {
         "content": "$1",
@@ -1373,7 +1373,7 @@
     }
   },
   "policyInEffectMinLength": {
-    "message": "Minimum length of $LENGTH$",
+    "message": "Минимална дужина од $LENGTH$",
     "placeholders": {
       "length": {
         "content": "$1",
@@ -1382,10 +1382,10 @@
     }
   },
   "policyInEffectUppercase": {
-    "message": "Contain one or more uppercase characters"
+    "message": "Садржи један или више великих слова"
   },
   "policyInEffectLowercase": {
-    "message": "Contain one or more lowercase characters"
+    "message": "Садржи један или више малих слова"
   },
   "policyInEffectNumbers": {
     "message": "Садрже један или више бројева"
@@ -1400,12 +1400,12 @@
     }
   },
   "masterPasswordPolicyRequirementsNotMet": {
-    "message": "Your new master password does not meet the policy requirements."
+    "message": "Ваша нова главна лозинка не испуњава захтеве смерница."
   },
   "acceptPolicies": {
-    "message": "By checking this box you agree to the following:"
+    "message": "Означавањем овог поља пристајете на следеће:"
   },
   "acceptPoliciesError": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "Услови услуге и Политика приватности нису признати."
   }
 }
diff --git a/src/locales/uk/messages.json b/src/locales/uk/messages.json
index e20a3c75a9..158f4afcfe 100644
--- a/src/locales/uk/messages.json
+++ b/src/locales/uk/messages.json
@@ -1247,7 +1247,7 @@
     "message": "Розблокувати з Touch ID"
   },
   "touchIdConsentMessage": {
-    "message": "розблокувати сховище"
+    "message": "Перевірити на Bitwarden."
   },
   "lockWithMasterPassOnRestart": {
     "message": "Блокувати головним паролем при перезапуску"
@@ -1403,9 +1403,9 @@
     "message": "Ваш новий головний пароль не задовольняє вимоги політики."
   },
   "acceptPolicies": {
-    "message": "By checking this box you agree to the following:"
+    "message": "Позначивши цей прапорець, ви погоджуєтеся з:"
   },
   "acceptPoliciesError": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "Умови користування та політика приватності не погоджені."
   }
 }
diff --git a/src/locales/zh_CN/messages.json b/src/locales/zh_CN/messages.json
index 4147148c6e..eb65b5a08c 100644
--- a/src/locales/zh_CN/messages.json
+++ b/src/locales/zh_CN/messages.json
@@ -1403,9 +1403,9 @@
     "message": "您的新主密码不符合策略要求。"
   },
   "acceptPolicies": {
-    "message": "By checking this box you agree to the following:"
+    "message": "选中此框表示您同意："
   },
   "acceptPoliciesError": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "尚未同意服务条款和隐私政策。"
   }
 }
diff --git a/src/locales/zh_TW/messages.json b/src/locales/zh_TW/messages.json
index 2483074184..2fb42c970a 100644
--- a/src/locales/zh_TW/messages.json
+++ b/src/locales/zh_TW/messages.json
@@ -1403,9 +1403,9 @@
     "message": "Your new master password does not meet the policy requirements."
   },
   "acceptPolicies": {
-    "message": "By checking this box you agree to the following:"
+    "message": "點擊此選取框，代表您同意下列項目:"
   },
   "acceptPoliciesError": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "尚未接受服務條款與隱私權保護政策。"
   }
 }