diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..ab2b5754
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,32 @@
+## Type of change
+- [ ] Bug fix
+- [ ] New feature development
+- [ ] Tech debt (refactoring, code cleanup, dependency upgrades, etc)
+- [ ] Build/deploy pipeline (DevOps)
+- [ ] Other
+
+## Objective
+<!--Describe what the purpose of this PR is. For example: what bug you're fixing or what new feature you're adding-->
+
+
+
+## Code changes
+<!--Explain the changes you've made to each file or major component. This should help the reviewer understand your changes-->
+<!--Also refer to any related changes or PRs in other repositories-->
+
+* **file.ext:** Description of what was changed and why
+
+## Screenshots
+<!--Required for any UI changes. Delete if not applicable-->
+
+
+
+## Testing requirements
+<!--What functionality requires testing by QA? This includes testing new behavior and regression testing-->
+
+
+
+## Before you submit
+- [ ] I have checked for **linting** errors (`npm run lint`) (required)
+- [ ] This change requires a **documentation update** (notify the documentation team)
+- [ ] This change has particular **deployment requirements** (notify the DevOps team)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e5259d9d..656afde5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,6 +30,9 @@ jobs:
     outputs:
       package_version: ${{ steps.retrieve-version.outputs.package_version }}
       build_number: ${{ steps.increment-version.outputs.build_number }}
+      safari_ref: ${{ steps.safari-ref.outputs.safari_ref }}
+      rc_branch_exists: ${{ steps.branch-check.outputs.rc_branch_exists }}
+      hotfix_branch_exists: ${{ steps.branch-check.outputs.hotfix_branch_exists }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
@@ -40,13 +43,42 @@ jobs:
           PKG_VERSION=$(jq -r .version src/package.json)
           echo "::set-output name=package_version::$PKG_VERSION"
 
-      - name: Increment version
+      - name: Increment Version
         id: increment-version
         run: |
           BUILD_NUMBER=$(expr 500 + $GITHUB_RUN_NUMBER)
           echo "Setting build number to $BUILD_NUMBER"
           echo "::set-output name=build_number::$BUILD_NUMBER"
 
+      - name: Get Safari Branch Ref
+        id: safari-ref
+        run: |
+          SAFARI_REF=master
+
+          if [ "$GITHUB_REF" = "hotfix" ]; then
+              SAFARI_REF=hotfix
+          elif [ "$GITHUB_REF" = "rc" ]; then
+              SAFARI_REF=rc
+          fi
+
+          echo "Setting Safari Extension ref to $SAFARI_REF"
+          echo "::set-output name=safari_ref::$SAFARI_REF"
+
+      - name: Check if special branches exist
+        id: branch-check
+        run: |
+          if [[ $(git ls-remote --heads origin rc) ]]; then
+            echo "::set-output name=rc_branch_exists::1"
+          else
+            echo "::set-output name=rc_branch_exists::0"
+          fi
+
+          if [[ $(git ls-remote --heads origin hotfix) ]]; then
+            echo "::set-output name=hotfix_branch_exists::1"
+          else
+            echo "::set-output name=hotfix_branch_exists::0"
+          fi
+
 
   linux:
     name: Linux Build
@@ -200,9 +232,6 @@ jobs:
         run: npm run lint
 
       - name: Build & Sign (dev)
-        run: |
-          npm run build
-          npm run pack:win
         env:
           ELECTRON_BUILDER_SIGN: 1
           SIGNING_VAULT_URL: ${{ secrets.SIGNING_VAULT_URL }}
@@ -210,6 +239,9 @@ jobs:
           SIGNING_TENANT_ID: ${{ secrets.SIGNING_TENANT_ID }}
           SIGNING_CLIENT_SECRET: ${{ secrets.SIGNING_CLIENT_SECRET }}
           SIGNING_CERT_NAME: ${{ secrets.SIGNING_CERT_NAME }}
+        run: |
+          npm run build
+          npm run pack:win
 
       - name: Rename appx files for store
         shell: pwsh
@@ -227,7 +259,7 @@ jobs:
           Copy-Item -Path ./stores/chocolatey -Destination ./dist/chocolatey -Recurse
           Copy-Item -Path ./dist/nsis-web/Bitwarden-Installer-${{ env._PACKAGE_VERSION }}.exe -Destination ./dist/chocolatey
 
-          $checksum = checksum -t sha256 ./dist/chocoloatey/Bitwarden-Installer-${{ env._PACKAGE_VERSION }}.exe
+          $checksum = checksum -t sha256 ./dist/chocolatey/Bitwarden-Installer-${{ env._PACKAGE_VERSION }}.exe
           $chocoInstall = "./dist/chocolatey/tools/chocolateyinstall.ps1"
           (Get-Content $chocoInstall).replace('__version__', "$env:_PACKAGE_VERSION").replace('__checksum__', $checksum) | Set-Content $chocoInstall
           choco pack ./dist/chocolatey/bitwarden.nuspec --version "$env:_PACKAGE_VERSION" --out ./dist/chocolatey
@@ -326,7 +358,7 @@ jobs:
 
   macos-build:
     name: MacOS Build
-    runs-on: macos-10.15
+    runs-on: macos-11
     needs: setup
     env:
       _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
@@ -465,6 +497,7 @@ jobs:
         with:
           repository: 'bitwarden/browser'
           path: 'dist-safari/browser'
+          ref: ${{ needs.setup.outputs.safari_ref }}
 
       - name: Build Safari extension
         shell: pwsh
@@ -473,7 +506,7 @@ jobs:
 
   macos-package-github:
     name: MacOS Package GitHub Release Assets
-    runs-on: macos-10.15
+    runs-on: macos-11
     needs: [setup, macos-build]
     env:
       _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
@@ -612,7 +645,7 @@ jobs:
         with:
           repository: 'bitwarden/browser'
           path: 'dist-safari/browser'
-          ref: ${{ github.ref }}
+          ref: ${{ needs.setup.outputs.safari_ref }}
 
       - name: Build Safari extension
         if: steps.safari-cache.outputs.cache-hit != 'true'
@@ -624,31 +657,31 @@ jobs:
         run: ./scripts/safari-build.ps1 -copyonly
 
       - name: Build application (dist)
-        run: |
-          npm run pack:mac
         env:
           APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
           APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+        run: |
+          npm run pack:mac
 
       - name: Upload .zip artifact
         uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700  # v2.2.3
         with:
-          name: Bitwarden-${{ env._PACKAGE_VERSION }}-mac.zip
-          path: ./dist/Bitwarden-${{ env._PACKAGE_VERSION }}-mac.zip
+          name: Bitwarden-${{ env._PACKAGE_VERSION }}-universal-mac.zip
+          path: ./dist/Bitwarden-${{ env._PACKAGE_VERSION }}-universal-mac.zip
           if-no-files-found: error
 
       - name: Upload .dmg artifact
         uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700  # v2.2.3
         with:
-          name: Bitwarden-${{ env._PACKAGE_VERSION }}.dmg
-          path: ./dist/Bitwarden-${{ env._PACKAGE_VERSION }}.dmg
+          name: Bitwarden-${{ env._PACKAGE_VERSION }}-universal.dmg
+          path: ./dist/Bitwarden-${{ env._PACKAGE_VERSION }}-universal.dmg
           if-no-files-found: error
 
       - name: Upload .dmg blockmap artifact
         uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700  # v2.2.3
         with:
-          name: Bitwarden-${{ env._PACKAGE_VERSION }}.dmg.blockmap
-          path: ./dist/Bitwarden-${{ env._PACKAGE_VERSION }}.dmg.blockmap
+          name: Bitwarden-${{ env._PACKAGE_VERSION }}-universal.dmg.blockmap
+          path: ./dist/Bitwarden-${{ env._PACKAGE_VERSION }}-universal.dmg.blockmap
           if-no-files-found: error
 
       - name: Upload latest auto-update artifact
@@ -661,7 +694,7 @@ jobs:
 
   macos-package-mas:
     name: MacOS Package Prod Release Asset
-    runs-on: macos-10.15
+    runs-on: macos-11
     needs: [setup, macos-build]
     env:
       _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
@@ -800,7 +833,7 @@ jobs:
         with:
           repository: 'bitwarden/browser'
           path: 'dist-safari/browser'
-          ref: ${{ github.ref }}
+          ref: ${{ needs.setup.outputs.safari_ref }}
 
       - name: Build Safari extension
         if: steps.safari-cache.outputs.cache-hit != 'true'
@@ -817,8 +850,6 @@ jobs:
         env:
           APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
           APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
-          SDKROOT: /Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk/
-          SDK_DIR: /Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk/
 
       - name: Upload .pkg artifact
         uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700  # v2.2.3
@@ -827,11 +858,23 @@ jobs:
           path: ./dist/mas-universal/Bitwarden-${{ env._PACKAGE_VERSION }}-universal.pkg
           if-no-files-found: error
 
+      - name: Deploy to TestFlight
+        env:
+          APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
+          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+        if: |
+            (github.ref == 'refs/heads/master'
+              && needs.setup.outputs.rc_branch_exists == 0
+              && needs.setup.outputs.hotfix_branch_exists == 0)
+            || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
+            || github.ref == 'refs/heads/hotfix'
+        run: npm run upload:mas
+
 
   macos-package-dev:
     name: MacOS Package Dev Release Asset
     if: false  # We need to look into how code signing works for dev
-    runs-on: macos-10.15
+    runs-on: macos-11
     needs: [setup, macos-build]
     env:
       _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
@@ -970,6 +1013,7 @@ jobs:
         with:
           repository: 'bitwarden/browser'
           path: 'dist-safari/browser'
+          ref: ${{ needs.setup.outputs.safari_ref }}
 
       - name: Build Safari extension
         if: steps.safari-cache.outputs.cache-hit != 'true'
@@ -986,8 +1030,6 @@ jobs:
         env:
           APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
           APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
-          SDKROOT: /Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk/
-          SDK_DIR: /Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk/
 
       - name: Zip masdev asset
         working-directory: ./dist/mas-dev-universal
@@ -1002,6 +1044,45 @@ jobs:
           if-no-files-found: error
 
 
+  crowdin-push:
+    name: Crowdin Push
+    if: github.ref == 'refs/heads/master'
+    needs:
+      - linux
+      - windows
+      - macos-package-github
+      - macos-package-mas
+    runs-on: ubuntu-20.04
+    env:
+      _CROWDIN_PROJECT_ID: "299360"
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
+
+      - name: Login to Azure
+        uses: Azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
+        with:
+          creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
+
+      - name: Retrieve secrets
+        id: retrieve-secrets
+        uses: Azure/get-keyvault-secrets@80ccd3fafe5662407cc2e55f202ee34bfff8c403
+        with:
+          keyvault: "bitwarden-prod-kv"
+          secrets: "crowdin-api-token"
+
+      - name: Upload Sources
+        uses: crowdin/github-action@e39093fd75daae7859c68eded4b43d42ec78d8ea  # v1.3.2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
+        with:
+          config: crowdin.yml
+          crowdin_branch_name: master
+          upload_sources: true
+          upload_translations: false
+
+
   check-failures:
     name: Check for failures
     if: always()
@@ -1014,6 +1095,7 @@ jobs:
       - macos-build
       - macos-package-github
       - macos-package-mas
+      - crowdin-push
     steps:
       - name: Check if any job failed
         if: ${{ (github.ref == 'refs/heads/master') || (github.ref == 'refs/heads/rc') }}
@@ -1025,6 +1107,7 @@ jobs:
           MACOS_BUILD_STATUS: ${{ needs.macos-build.result }}
           MACOS_PKG_GITHUB_STATUS: ${{ needs.macos-package-github.result }}
           MACOS_PKG_MAS_STATUS: ${{ needs.macos-package-mas.result }}
+          CROWDIN_PUSH_STATUS: ${{ needs.crowdin-push.result }}
         run: |
           if [ "$CLOC_STATUS" = "failure" ]; then
               exit 1
@@ -1040,6 +1123,8 @@ jobs:
               exit 1
           elif [ "$MACOS_PKG_MAS_STATUS" = "failure" ]; then
               exit 1
+          elif [ "$CROWDIN_PUSH_STATUS" = "failure" ]; then
+              exit 1
           fi
 
       - name: Login to Azure - Prod Subscription
diff --git a/.github/workflows/crowndin-sync.yml b/.github/workflows/crowndin-pull.yml
similarity index 97%
rename from .github/workflows/crowndin-sync.yml
rename to .github/workflows/crowndin-pull.yml
index c86203af..55d0c8ee 100644
--- a/.github/workflows/crowndin-sync.yml
+++ b/.github/workflows/crowndin-pull.yml
@@ -4,8 +4,8 @@ name: Crowdin Sync
 on:
   workflow_dispatch:
     inputs: {}
-# schedule:
-#   - cron: '0 0 * * *'
+  schedule:
+    - cron: '0 0 * * 5'
 
 jobs:
   crowdin-sync:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 89017312..97897d9d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,20 +10,19 @@ jobs:
     runs-on: ubuntu-20.04
     outputs:
       package_version: ${{ steps.retrieve-version.outputs.package_version }}
+      branch-name: ${{ steps.branch.outputs.branch-name }}
     steps:
       - name: Branch check
         run: |
-          if [[ "$GITHUB_REF" != "refs/heads/rc" ]]; then
+          if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ "$GITHUB_REF" != "refs/heads/hotfix" ]]; then
             echo "==================================="
-            echo "[!] Can only release from rc branch"
+            echo "[!] Can only release from the 'rc' or 'hotfix' branches"
             echo "==================================="
             exit 1
           fi
 
       - name: Checkout repo
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
-        with:
-          ref: rc
 
       - name: Get Package Version
         id: retrieve-version
@@ -45,12 +44,18 @@ jobs:
             exit 1
           fi
 
+      - name: Get branch name
+        id: branch
+        run: |
+          BRANCH_NAME=$(basename ${{ github.ref }})
+          echo "::set-output name=branch-name::$BRANCH_NAME"
+
       - name: Download all artifacts
         uses: bitwarden/gh-actions/download-artifacts@23433be15ed6fd046ce12b6889c5184a8d9c8783
         with:
           workflow: build.yml
           workflow_conclusion: success
-          branch: rc
+          branch: ${{ steps.branch.outputs.branch-name }}
 
       - name: Create release
         uses: ncipollo/release-action@95215a3cb6e6a1908b3c44e00b4fdb15548b1e09  # v2.8.5
@@ -67,18 +72,18 @@ jobs:
                       Bitwarden-Installer-${{ env.PKG_VERSION }}.exe,
                       Bitwarden-${{ env.PKG_VERSION }}-ia32-store.appx,
                       Bitwarden-${{ env.PKG_VERSION }}-ia32.appx,
-                      bitwarden-${{ env.PKG_VERSION }}-ia32.nsis.7z,
+                      Bitwarden-${{ env.PKG_VERSION }}-ia32.nsis.7z,
                       Bitwarden-${{ env.PKG_VERSION }}-x64-store.appx,
                       Bitwarden-${{ env.PKG_VERSION }}-x64.appx,
-                      bitwarden-${{ env.PKG_VERSION }}-x64.nsis.7z,
+                      Bitwarden-${{ env.PKG_VERSION }}-x64.nsis.7z,
                       Bitwarden-${{ env.PKG_VERSION }}-arm64-store.appx,
                       Bitwarden-${{ env.PKG_VERSION }}-arm64.appx,
-                      bitwarden-${{ env.PKG_VERSION }}-arm64.nsis.7z,
+                      Bitwarden-${{ env.PKG_VERSION }}-arm64.nsis.7z,
                       bitwarden.${{ env.PKG_VERSION }}.nupkg,
                       latest.yml,
-                      Bitwarden-${{ env.PKG_VERSION }}-mac.zip,
-                      Bitwarden-${{ env.PKG_VERSION }}.dmg,
-                      Bitwarden-${{ env.PKG_VERSION }}.dmg.blockmap,
+                      Bitwarden-${{ env.PKG_VERSION }}-universal-mac.zip,
+                      Bitwarden-${{ env.PKG_VERSION }}-universal.dmg,
+                      Bitwarden-${{ env.PKG_VERSION }}-universal.dmg.blockmap,
                       latest-mac.yml,
                       Bitwarden-${{ env.PKG_VERSION }}-universal.pkg"
           commit: ${{ github.sha }}
@@ -98,8 +103,6 @@ jobs:
     steps:
       - name: Checkout Repo
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
-        with:
-          ref: rc
 
       - name: Install Snap
         uses: samuelmeuli/action-snapcraft@10d7d0a84d9d86098b19f872257df314b0bd8e2d  # v1.2.0
@@ -114,7 +117,7 @@ jobs:
         with:
           workflow: build.yml
           workflow_conclusion: success
-          branch: rc
+          branch: ${{ needs.setup.outputs.branch-name }}
           artifacts: bitwarden_${{ env._PKG_VERSION }}_amd64.snap
           path: ./dist
 
@@ -136,8 +139,6 @@ jobs:
     steps:
       - name: Checkout Repo
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
-        with:
-          ref: rc
 
       - name: Setup Chocolatey
         run: choco apikey --key $env:CHOCO_API_KEY --source https://push.chocolatey.org/
@@ -153,7 +154,7 @@ jobs:
         with:
           workflow: build.yml
           workflow_conclusion: success
-          branch: rc
+          branch: ${{ needs.setup.outputs.branch-name }}
           artifacts: bitwarden.${{ env._PKG_VERSION }}.nupkg
           path: ./dist
 
@@ -162,34 +163,3 @@ jobs:
         run: |
           cd dist
           choco push
-
-
-  macos:
-    name: Deploy MacOS
-    runs-on: macos-10.15
-    needs: setup
-    env:
-      _PKG_VERSION: ${{ needs.setup.outputs.package_version }}
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f  # v2.3.4
-        with:
-          ref: rc
-
-      - name: Make target directory
-        run: mkdir -p dist/mas-universal
-
-      - name: Download Mac artifact
-        uses: bitwarden/gh-actions/download-artifacts@23433be15ed6fd046ce12b6889c5184a8d9c8783
-        with:
-          workflow: build.yml
-          workflow_conclusion: success
-          branch: rc
-          artifacts: Bitwarden-${{ env._PKG_VERSION }}-universal.pkg
-          path: ./dist/mas-universal
-
-      - name: Deploy to App Store
-        run: npm run upload:mas
-        env:
-          APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
-          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
diff --git a/crowdin.yml b/crowdin.yml
index 27f37177..8ea20348 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -1,7 +1,9 @@
 project_id_env: _CROWDIN_PROJECT_ID
 api_token_env: CROWDIN_API_TOKEN
+preserve_hierarchy: true
 files:
   - source: /src/locales/en/messages.json
+    dest: /src/locales/en/%original_file_name%
     translation: /src/locales/%two_letters_code%/%original_file_name%
     update_option: update_as_unapproved
     languages_mapping:
diff --git a/jslib b/jslib
index 24fe8360..8f177e2d 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 24fe836032354d4ec39435776e54dd0995e1b389
+Subproject commit 8f177e2d3a879b854db5c6e6d7d386b24d637a66
diff --git a/package-lock.json b/package-lock.json
index aa62d524..32205c90 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -86,6 +86,7 @@
       }
     },
     "jslib/common": {
+      "name": "@bitwarden/jslib-common",
       "version": "0.0.0",
       "license": "GPL-3.0",
       "dependencies": {
@@ -112,12 +113,13 @@
       }
     },
     "jslib/electron": {
+      "name": "@bitwarden/jslib-electron",
       "version": "0.0.0",
       "license": "GPL-3.0",
       "dependencies": {
         "@bitwarden/jslib-common": "file:../common",
         "@nodert-win10-rs4/windows.security.credentials.ui": "^0.4.4",
-        "electron": "14.0.1",
+        "electron": "14.2.0",
         "electron-log": "4.4.1",
         "electron-store": "8.0.1",
         "electron-updater": "4.3.9",
@@ -4539,9 +4541,9 @@
       }
     },
     "node_modules/electron": {
-      "version": "14.0.1",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-14.0.1.tgz",
-      "integrity": "sha512-1XILvfE5mQEBz5L/QeNfcwC3PxAIjwMyA3GR8Naw5C0IKAnHl3lAdjczbtGX8nqbcEpOAVo+4TMSpcPD3zxe8Q==",
+      "version": "14.2.0",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-14.2.0.tgz",
+      "integrity": "sha512-6CmAv1P0xcwK3FQOSA27fHI36/wctSFVgj46VODn56srXXQWeolkK1VzeAFNE613iAuuH9jJdHvE3gz+c7XkNA==",
       "hasInstallScript": true,
       "dependencies": {
         "@electron/get": "^1.0.1",
@@ -14550,7 +14552,7 @@
         "@bitwarden/jslib-common": "file:../common",
         "@nodert-win10-rs4/windows.security.credentials.ui": "^0.4.4",
         "@types/node": "^14.17.1",
-        "electron": "14.0.1",
+        "electron": "14.2.0",
         "electron-log": "4.4.1",
         "electron-store": "8.0.1",
         "electron-updater": "4.3.9",
@@ -17668,9 +17670,9 @@
       }
     },
     "electron": {
-      "version": "14.0.1",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-14.0.1.tgz",
-      "integrity": "sha512-1XILvfE5mQEBz5L/QeNfcwC3PxAIjwMyA3GR8Naw5C0IKAnHl3lAdjczbtGX8nqbcEpOAVo+4TMSpcPD3zxe8Q==",
+      "version": "14.2.0",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-14.2.0.tgz",
+      "integrity": "sha512-6CmAv1P0xcwK3FQOSA27fHI36/wctSFVgj46VODn56srXXQWeolkK1VzeAFNE613iAuuH9jJdHvE3gz+c7XkNA==",
       "requires": {
         "@electron/get": "^1.0.1",
         "@types/node": "^14.6.2",
diff --git a/package.json b/package.json
index b196a75c..574fefd5 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "clean:l10n": "git push origin --delete l10n_master",
     "pack:dir": "npm run clean:dist && electron-builder --dir -p never",
     "pack:lin": "npm run clean:dist && electron-builder --linux --x64 -p never",
-    "pack:mac": "npm run clean:dist && electron-builder --mac -p never",
+    "pack:mac": "npm run clean:dist && electron-builder --mac --universal -p never",
     "pack:mac:arm64": "npm run clean:dist && electron-builder --mac --arm64 -p never",
     "pack:mac:mas": "npm run clean:dist && electron-builder --mac mas --universal -p never",
     "pack:mac:masdev": "npm run clean:dist && electron-builder --mac mas-dev --universal -p never",
diff --git a/scripts/after-sign.js b/scripts/after-sign.js
index b5c38979..92feb962 100644
--- a/scripts/after-sign.js
+++ b/scripts/after-sign.js
@@ -2,6 +2,7 @@ require('dotenv').config();
 const path = require('path');
 const fse = require('fs-extra');
 const { notarize } = require('electron-notarize');
+const { deepAssign } = require('builder-util');
 
 exports.default = run;
 
@@ -12,18 +13,33 @@ async function run(context) {
     const appName = context.packager.appInfo.productFilename;
     const appPath = `${context.appOutDir}/${appName}.app`;
     const macBuild = context.electronPlatformName === 'darwin';
+    const copyPlugIn = ['darwin', 'mas'].includes(context.electronPlatformName);
 
-    if (macBuild) {
+    if (copyPlugIn) {
         // Copy Safari plugin to work-around https://github.com/electron-userland/electron-builder/issues/5552
         const plugIn = path.join(__dirname, '../PlugIns');
         if (fse.existsSync(plugIn)) {
             fse.mkdirSync(path.join(appPath, 'Contents/PlugIns'));
             fse.copySync(path.join(plugIn, 'safari.appex'), path.join(appPath, 'Contents/PlugIns/safari.appex'));
-        
-            // Resign to sign safari extension
-            await context.packager.signApp(context, true);
-        }
 
+            // Resign to sign safari extension
+            if (context.electronPlatformName === 'mas') {
+                const masBuildOptions = deepAssign({}, context.packager.platformSpecificBuildOptions, context.packager.config.mas);
+                if (context.targets.some(e => e.name === 'mas-dev')) {
+                    deepAssign(masBuildOptions, {
+                        type: 'development',
+                    });
+                }
+                if (context.packager.packagerOptions.prepackaged == null) {
+                    await context.packager.sign(appPath, context.appOutDir, masBuildOptions, context.arch);
+                }
+            } else {
+                await context.packager.signApp(context, true);
+            }
+        }
+    }
+
+    if (macBuild) {
         console.log('### Notarizing ' + appPath);
         const appleId = process.env.APPLE_ID_USERNAME || process.env.APPLEID;
         const appleIdPassword = process.env.APPLE_ID_PASSWORD || `@keychain:AC_PASSWORD`;
diff --git a/src/app/accounts/environment.component.html b/src/app/accounts/environment.component.html
index 36d7d95c..72ef27c5 100644
--- a/src/app/accounts/environment.component.html
+++ b/src/app/accounts/environment.component.html
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" attr.aria-label="{{'settings' | i18n}}">
+<div class="modal fade" role="dialog" aria-modal="true" attr.aria-label="{{'settings' | i18n}}">
     <div class="modal-dialog" role="document">
         <form class="modal-content" (ngSubmit)="submit()">
             <div class="modal-body">
diff --git a/src/app/accounts/lock.component.ts b/src/app/accounts/lock.component.ts
index cd7c63d9..a636423b 100644
--- a/src/app/accounts/lock.component.ts
+++ b/src/app/accounts/lock.component.ts
@@ -13,6 +13,7 @@ import { ApiService } from 'jslib-common/abstractions/api.service';
 import { CryptoService } from 'jslib-common/abstractions/crypto.service';
 import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
 import { I18nService } from 'jslib-common/abstractions/i18n.service';
+import { KeyConnectorService } from 'jslib-common/abstractions/keyConnector.service';
 import { LogService } from 'jslib-common/abstractions/log.service';
 import { MessagingService } from 'jslib-common/abstractions/messaging.service';
 import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
@@ -38,9 +39,10 @@ export class LockComponent extends BaseLockComponent implements OnDestroy {
         environmentService: EnvironmentService, stateService: StateService,
         apiService: ApiService, private route: ActivatedRoute,
         private broadcasterService: BroadcasterService, private ngZone: NgZone,
-        logService: LogService) {
+        logService: LogService, keyConnectorService: KeyConnectorService) {
         super(router, i18nService, platformUtilsService, messagingService, cryptoService,
-            vaultTimeoutService, environmentService, stateService, apiService, logService);
+            vaultTimeoutService, environmentService, stateService, apiService, logService,
+            keyConnectorService);
     }
 
     async ngOnInit() {
diff --git a/src/app/accounts/premium.component.html b/src/app/accounts/premium.component.html
index fbffa4d8..82b4290e 100644
--- a/src/app/accounts/premium.component.html
+++ b/src/app/accounts/premium.component.html
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="premiumTitle">
+<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="premiumTitle">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-body">
diff --git a/src/app/accounts/remove-password.component.html b/src/app/accounts/remove-password.component.html
new file mode 100644
index 00000000..bf2ef627
--- /dev/null
+++ b/src/app/accounts/remove-password.component.html
@@ -0,0 +1,18 @@
+<div id="remove-password-page" *ngIf="!loading">
+    <div class="content">
+        <h1>{{'removeMasterPassword' | i18n}}</h1>
+        <p>{{'convertOrganizationEncryptionDesc' | i18n : organization.name}}</p>
+        <div class="buttons">
+            <button type="submit" class="btn primary block" [disabled]="actionPromise" appBlurClick
+                (click)="convert()">
+                <b [hidden]="continuing">{{'removeMasterPassword' | i18n}}</b>
+                <i class="fa fa-spinner fa-spin" [hidden]="!continuing" aria-hidden="true"></i>
+            </button>
+            <button type="button" class="btn secondary block" [disabled]="actionPromise" appBlurClick
+                (click)="leave()">
+                <b [hidden]="leaving">{{'leaveOrganization' | i18n}}</b>
+                <i class="fa fa-spinner fa-spin" [hidden]="!leaving" aria-hidden="true"></i>
+            </button>
+        </div>
+    </div>
+</div>
diff --git a/src/app/accounts/remove-password.component.ts b/src/app/accounts/remove-password.component.ts
new file mode 100644
index 00000000..c8326949
--- /dev/null
+++ b/src/app/accounts/remove-password.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+import { RemovePasswordComponent as BaseRemovePasswordComponent } from 'jslib-angular/components/remove-password.component';
+
+@Component({
+    selector: 'app-remove-password',
+    templateUrl: 'remove-password.component.html',
+})
+export class RemovePasswordComponent extends BaseRemovePasswordComponent {
+}
diff --git a/src/app/accounts/settings.component.html b/src/app/accounts/settings.component.html
index 297f0f02..1f3d7339 100644
--- a/src/app/accounts/settings.component.html
+++ b/src/app/accounts/settings.component.html
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" attr.aria-label="{{'settings' | i18n}}" cdkTrapFocus cdkTrapFocusAutoCapture>
+<div class="modal fade" role="dialog" aria-modal="true" attr.aria-label="{{'settings' | i18n}}">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-body form">
diff --git a/src/app/accounts/two-factor-options.component.html b/src/app/accounts/two-factor-options.component.html
index 04f589c8..95789f6c 100644
--- a/src/app/accounts/two-factor-options.component.html
+++ b/src/app/accounts/two-factor-options.component.html
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="twoStepTitle">
+<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="twoStepTitle">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-body">
diff --git a/src/app/accounts/vault-timeout-input.component.html b/src/app/accounts/vault-timeout-input.component.html
index f959adff..7874d183 100644
--- a/src/app/accounts/vault-timeout-input.component.html
+++ b/src/app/accounts/vault-timeout-input.component.html
@@ -5,7 +5,7 @@
 <div [formGroup]="form">
     <div class="form-group">
         <label for="vaultTimeout">{{'vaultTimeout' | i18n}}</label>
-        <select id="vaultTimeout" name="VaultTimeout" formControlName="vaultTimeout" class="form-control">
+        <select id="vaultTimeout" name="VaultTimeout" formControlName="vaultTimeout" class="form-control" appAutofocus>
             <option *ngFor="let o of vaultTimeouts" [ngValue]="o.value">{{o.name}}</option>
         </select>
         <small class="form-text text-muted">{{'vaultTimeoutDesc' | i18n}}</small>
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index dac64540..8131df63 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -11,6 +11,7 @@ import { HintComponent } from './accounts/hint.component';
 import { LockComponent } from './accounts/lock.component';
 import { LoginComponent } from './accounts/login.component';
 import { RegisterComponent } from './accounts/register.component';
+import { RemovePasswordComponent } from './accounts/remove-password.component';
 import { SetPasswordComponent } from './accounts/set-password.component';
 import { SsoComponent } from './accounts/sso.component';
 import { TwoFactorComponent } from './accounts/two-factor.component';
@@ -51,6 +52,12 @@ const routes: Routes = [
         component: UpdateTempPasswordComponent,
         canActivate: [AuthGuardService],
     },
+    {
+        path: 'remove-password',
+        component: RemovePasswordComponent,
+        canActivate: [AuthGuardService],
+        data: { titleId: 'removeMasterPassword' },
+    },
 ];
 
 @NgModule({
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index ccf607b6..67f920ab 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -30,6 +30,7 @@ import { CryptoService } from 'jslib-common/abstractions/crypto.service';
 import { EventService } from 'jslib-common/abstractions/event.service';
 import { FolderService } from 'jslib-common/abstractions/folder.service';
 import { I18nService } from 'jslib-common/abstractions/i18n.service';
+import { KeyConnectorService } from 'jslib-common/abstractions/keyConnector.service';
 import { LogService } from 'jslib-common/abstractions/log.service';
 import { MessagingService } from 'jslib-common/abstractions/messaging.service';
 import { NotificationsService } from 'jslib-common/abstractions/notifications.service';
@@ -107,12 +108,13 @@ export class AppComponent implements OnInit {
         private searchService: SearchService, private notificationsService: NotificationsService,
         private platformUtilsService: PlatformUtilsService, private systemService: SystemService,
         private stateService: StateService, private eventService: EventService,
-        private policyService: PolicyService, private modalService: ModalService) { }
+        private policyService: PolicyService, private modalService: ModalService,
+        private keyConnectorService: KeyConnectorService) { }
 
     ngOnInit() {
         this.ngZone.runOutsideAngular(() => {
             setTimeout(async () => {
-                await this.updateAppMenu();
+                await this.updateAppMenu('auth');
             }, 1000);
 
             window.onmousemove = () => this.recordActivity();
@@ -129,7 +131,7 @@ export class AppComponent implements OnInit {
                     case 'loggedIn':
                     case 'unlocked':
                         this.notificationsService.updateConnection();
-                        this.updateAppMenu();
+                        this.updateAppMenu('auth');
                         this.systemService.cancelProcessReload();
                         break;
                     case 'loggedOut':
@@ -137,7 +139,7 @@ export class AppComponent implements OnInit {
                             this.modal.close();
                         }
                         this.notificationsService.updateConnection();
-                        this.updateAppMenu();
+                        this.updateAppMenu('auth');
                         this.systemService.startProcessReload();
                         await this.systemService.clearPendingClipboard();
                         break;
@@ -156,7 +158,7 @@ export class AppComponent implements OnInit {
                         }
                         this.router.navigate(['lock']);
                         this.notificationsService.updateConnection();
-                        this.updateAppMenu();
+                        this.updateAppMenu('auth');
                         this.systemService.startProcessReload();
                         await this.systemService.clearPendingClipboard();
                         break;
@@ -166,6 +168,7 @@ export class AppComponent implements OnInit {
                     case 'syncStarted':
                         break;
                     case 'syncCompleted':
+                        await this.updateAppMenu('sync');
                         break;
                     case 'openSettings':
                         await this.openModal<SettingsComponent>(SettingsComponent, this.settingsRef);
@@ -267,6 +270,10 @@ export class AppComponent implements OnInit {
                             await this.openPasswordGenerator();
                         }
                         break;
+                    case 'convertAccountToKeyConnector':
+                        this.keyConnectorService.setConvertAccountRequired(true);
+                        this.router.navigate(['/remove-password']);
+                        break;
                 }
             });
         });
@@ -325,11 +332,19 @@ export class AppComponent implements OnInit {
         });
     }
 
-    private async updateAppMenu() {
-        try {
+    private async updateAppMenu(type: 'auth' | 'sync') {
+        let data: any;
+        if (type === 'sync') {
+            data = {
+                enableChangeMasterPass: !await this.keyConnectorService.getUsesKeyConnector(),
+            };
+        } else {
             const stateAccounts = this.stateService.accounts?.getValue();
             if (stateAccounts == null || Object.keys(stateAccounts).length < 1) {
-                this.messagingService.send('updateAppMenu', { accounts: null, activeUserId: null });
+                data = {
+                    accounts: null,
+                    activeUserId: null,
+                }
             } else {
                 const accounts: { [userId: string]: any } = {};
                 for (const i in stateAccounts) {
@@ -345,11 +360,14 @@ export class AppComponent implements OnInit {
                         };
                     }
                 }
-                this.messagingService.send('updateAppMenu', { accounts: accounts, activeUserId: await this.stateService.getUserId() });
+                data = {
+                    accounts: accounts,
+                    activeUserId: await this.stateService.getUserId(),
+                };
             }
-        } catch (e) {
-            this.logService.error(e);
         }
+
+        this.messagingService.send('updateAppMenu', data);
     }
 
     private async logOut(expired: boolean, userId?: string) {
@@ -366,6 +384,7 @@ export class AppComponent implements OnInit {
             this.vaultTimeoutService.clear(userId),
             this.policyService.clear(userId),
             this.stateService.purge({ userId: userId }),
+            this.keyConnectorService.clear(),
         ]);
 
         await this.stateService.setBiometricLocked(true);
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 427686b6..b5b3fb77 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -21,6 +21,7 @@ import { LockComponent } from './accounts/lock.component';
 import { LoginComponent } from './accounts/login.component';
 import { PremiumComponent } from './accounts/premium.component';
 import { RegisterComponent } from './accounts/register.component';
+import { RemovePasswordComponent } from './accounts/remove-password.component';
 import { SetPasswordComponent } from './accounts/set-password.component';
 import { SettingsComponent } from './accounts/settings.component';
 import { SsoComponent } from './accounts/sso.component';
@@ -32,6 +33,7 @@ import { VaultTimeoutInputComponent } from './accounts/vault-timeout-input.compo
 import { AvatarComponent } from 'jslib-angular/components/avatar.component';
 import { CalloutComponent } from 'jslib-angular/components/callout.component';
 import { IconComponent } from 'jslib-angular/components/icon.component';
+import { VerifyMasterPasswordComponent } from 'jslib-angular/components/verify-master-password.component';
 
 import { A11yTitleDirective } from 'jslib-angular/directives/a11y-title.directive';
 import { ApiActionDirective } from 'jslib-angular/directives/api-action.directive';
@@ -185,6 +187,7 @@ registerLocaleData(localeZhTw, 'zh-TW');
     declarations: [
         A11yTitleDirective,
         AddEditComponent,
+        AddEditCustomFieldsComponent,
         ApiActionDirective,
         AppComponent,
         AttachmentsComponent,
@@ -210,14 +213,17 @@ registerLocaleData(localeZhTw, 'zh-TW');
         PasswordGeneratorComponent,
         PasswordGeneratorHistoryComponent,
         PasswordHistoryComponent,
+        PasswordRepromptComponent,
         PremiumComponent,
         RegisterComponent,
+        RemovePasswordComponent,
         SearchCiphersPipe,
         SelectCopyDirective,
         SendAddEditComponent,
-        SendEffluxDatesComponent,
         SendComponent,
+        SendEffluxDatesComponent,
         SetPasswordComponent,
+        SetPinComponent,
         SettingsComponent,
         ShareComponent,
         SsoComponent,
@@ -228,11 +234,9 @@ registerLocaleData(localeZhTw, 'zh-TW');
         TwoFactorOptionsComponent,
         UpdateTempPasswordComponent,
         VaultComponent,
-        ViewComponent,
-        PasswordRepromptComponent,
-        SetPinComponent,
         VaultTimeoutInputComponent,
-        AddEditCustomFieldsComponent,
+        VerifyMasterPasswordComponent,
+        ViewComponent,
         ViewCustomFieldsComponent,
         HeaderComponent,
         AccountSwitcherComponent,
diff --git a/src/app/components/password-reprompt.component.html b/src/app/components/password-reprompt.component.html
index 0033cdd2..cc005a52 100644
--- a/src/app/components/password-reprompt.component.html
+++ b/src/app/components/password-reprompt.component.html
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true">
+<div class="modal fade" role="dialog" aria-modal="true">
     <div class="modal-dialog modal-dialog-scrollable" role="document">
         <form class="modal-content" #form (ngSubmit)="submit()">
             <div class="modal-body">
diff --git a/src/app/components/set-pin.component.html b/src/app/components/set-pin.component.html
index 6b7e1d77..21eeb84a 100644
--- a/src/app/components/set-pin.component.html
+++ b/src/app/components/set-pin.component.html
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" cdkTrapFocus cdkTrapFocusAutoCapture>
+<div class="modal fade" role="dialog" aria-modal="true">
     <div class="modal-dialog modal-dialog-scrollable set-pin-modal" role="document">
         <form class="modal-content" #form (ngSubmit)="submit()">
             <div class="modal-body">
@@ -11,7 +11,7 @@
                             <div class="row-main">
                                 <label for="pin">{{'pin' | i18n}}</label>
                                 <input id="pin" type="{{showPin ? 'text' : 'password'}}" name="Pin" class="monospaced"
-                                    [(ngModel)]="pin" required appInputVerbatim cdkFocusInitial>
+                                    [(ngModel)]="pin" required appInputVerbatim appAutofocus>
                             </div>
                             <div class="action-buttons">
                                 <a class="row-btn" href="#" appStopClick appBlurClick
diff --git a/src/app/services.module.ts b/src/app/services.module.ts
index 8e0410d0..37c370c9 100644
--- a/src/app/services.module.ts
+++ b/src/app/services.module.ts
@@ -36,6 +36,7 @@ import { EventService } from 'jslib-common/services/event.service';
 import { ExportService } from 'jslib-common/services/export.service';
 import { FileUploadService } from 'jslib-common/services/fileUpload.service';
 import { FolderService } from 'jslib-common/services/folder.service';
+import { KeyConnectorService } from 'jslib-common/services/keyConnector.service';
 import { NotificationsService } from 'jslib-common/services/notifications.service';
 import { OrganizationService } from 'jslib-common/services/organization.service';
 import { PasswordGenerationService } from 'jslib-common/services/passwordGeneration.service';
@@ -49,6 +50,7 @@ import { SyncService } from 'jslib-common/services/sync.service';
 import { SystemService } from 'jslib-common/services/system.service';
 import { TokenService } from 'jslib-common/services/token.service';
 import { TotpService } from 'jslib-common/services/totp.service';
+import { UserVerificationService } from 'jslib-common/services/userVerification.service';
 import { VaultTimeoutService } from 'jslib-common/services/vaultTimeout.service';
 import { WebCryptoFunctionService } from 'jslib-common/services/webCryptoFunction.service';
 
@@ -67,6 +69,7 @@ import { ExportService as ExportServiceAbstraction } from 'jslib-common/abstract
 import { FileUploadService as FileUploadServiceAbstraction }  from 'jslib-common/abstractions/fileUpload.service';
 import { FolderService as FolderServiceAbstraction } from 'jslib-common/abstractions/folder.service';
 import { I18nService as I18nServiceAbstraction } from 'jslib-common/abstractions/i18n.service';
+import { KeyConnectorService as KeyConnectorServiceAbstraction } from 'jslib-common/abstractions/keyConnector.service';
 import { LogService as LogServiceAbstraction } from 'jslib-common/abstractions/log.service';
 import { MessagingService as MessagingServiceAbstraction } from 'jslib-common/abstractions/messaging.service';
 import { NotificationsService as NotificationsServiceAbstraction } from 'jslib-common/abstractions/notifications.service';
@@ -87,6 +90,7 @@ import { SyncService as SyncServiceAbstraction } from 'jslib-common/abstractions
 import { SystemService as SystemServiceAbstraction } from 'jslib-common/abstractions/system.service';
 import { TokenService as TokenServiceAbstraction } from 'jslib-common/abstractions/token.service';
 import { TotpService as TotpServiceAbstraction } from 'jslib-common/abstractions/totp.service';
+import { UserVerificationService as UserVerificationServiceAbstraction } from 'jslib-common/abstractions/userVerification.service';
 import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from 'jslib-common/abstractions/vaultTimeout.service';
 
 import { ThemeType } from 'jslib-common/enums/themeType';
@@ -123,17 +127,22 @@ const sendService = new SendService(cryptoService, apiService, fileUploadService
 const organizationService = new OrganizationService(stateService);
 const providerService: ProviderServiceAbstraction = new ProviderService(stateService);
 const policyService = new PolicyService(stateService, organizationService, apiService);
+const keyConnectorService = new KeyConnectorService(stateService, cryptoService, apiService,
+    environmentService, tokenService, logService, organizationService);
 const vaultTimeoutService = new VaultTimeoutService(cipherService, folderService, collectionService,
-    cryptoService, platformUtilsService, messagingService, searchService, tokenService, policyService, stateService, null,
+    cryptoService, platformUtilsService, messagingService, searchService, tokenService, policyService, keyConnectorService,
+    stateService, null,
     async (userId?: string) => messagingService.send('logout', { userId: userId, expired: false }));
 const syncService = new SyncService(apiService, settingsService,
     folderService, cipherService, cryptoService, collectionService, messagingService, policyService, sendService, logService,
-    async (expired: boolean) => messagingService.send('logout', { expired: expired }), stateService, organizationService, providerService);
+    keyConnectorService, stateService, organizationService, providerService,
+    async (expired: boolean) => messagingService.send('logout', { expired: expired }));
 const passwordGenerationService = new PasswordGenerationService(cryptoService, policyService, stateService);
 const totpService = new TotpService(cryptoFunctionService, logService, stateService);
 const containerService = new ContainerService(cryptoService);
 const authService = new AuthService(cryptoService, apiService, tokenService, appIdService, i18nService,
-    platformUtilsService, messagingService, vaultTimeoutService, logService, cryptoFunctionService, stateService);
+    platformUtilsService, messagingService, vaultTimeoutService, logService, cryptoFunctionService,
+    keyConnectorService, environmentService, stateService);
 const exportService = new ExportService(folderService, cipherService, apiService, cryptoService);
 const auditService = new AuditService(cryptoFunctionService, apiService);
 const notificationsService = new NotificationsService(syncService, appIdService,
@@ -211,6 +220,7 @@ export function initFactory(): Function {
         { provide: FileUploadServiceAbstraction, useValue: fileUploadService },
         { provide: FolderServiceAbstraction, useValue: folderService },
         { provide: I18nServiceAbstraction, useValue: i18nService },
+        { provide: KeyConnectorServiceAbstraction, useValue: keyConnectorService },
         { provide: LogServiceAbstraction, useValue: logService },
         { provide: MessagingServiceAbstraction, useValue: messagingService },
         { provide: NativeMessagingService, useValue: nativeMessagingService },
@@ -229,6 +239,7 @@ export function initFactory(): Function {
         { provide: SystemServiceAbstraction, useValue: systemService },
         { provide: TokenServiceAbstraction, useValue: tokenService },
         { provide: TotpServiceAbstraction, useValue: totpService },
+        { provide: UserVerificationServiceAbstraction, useClass: UserVerificationService },
         { provide: VaultTimeoutServiceAbstraction, useValue: vaultTimeoutService },
         {
             provide: APP_INITIALIZER,
diff --git a/src/app/vault/add-edit-custom-fields.component.html b/src/app/vault/add-edit-custom-fields.component.html
index fc519f47..40f65c47 100644
--- a/src/app/vault/add-edit-custom-fields.component.html
+++ b/src/app/vault/add-edit-custom-fields.component.html
@@ -16,13 +16,21 @@
                 <div class="row-main">
                     <input id="fieldName{{i}}" type="text" name="Field.Name{{i}}" [(ngModel)]="f.name"
                         class="row-label" placeholder="{{'name' | i18n}}">
+                    <!-- Text -->
                     <input id="fieldValue{{i}}" type="text" name="Field.Value{{i}}" [(ngModel)]="f.value"
                         *ngIf="f.type === fieldType.Text" placeholder="{{'value' | i18n}}">
+                    <!-- Password -->
                     <input id="fieldValue{{i}}" type="{{f.showValue ? 'text' : 'password'}}"
                         name="Field.Value{{i}}" [(ngModel)]="f.value" class="monospaced"
                         *ngIf="f.type === fieldType.Hidden" placeholder="{{'value' | i18n}}"
                         [disabled]="!cipher.viewPassword && !f.newField">
+                    <!-- Linked -->
+                    <select id="fieldValue{{i}}" name="Field.Value{{i}}" [(ngModel)]="f.linkedId"
+                        *ngIf="f.type === fieldType.Linked && cipher.linkedFieldOptions != null">
+                        <option *ngFor="let o of linkedFieldOptions" [ngValue]="o.value">{{o.name}}</option>
+                    </select>
                 </div>
+                <!-- Boolean -->
                 <input id="fieldValue{{i}}" name="Field.Value{{i}}" type="checkbox" [(ngModel)]="f.value"
                     *ngIf="f.type === fieldType.Boolean" appTrueFalseValue trueValue="true"
                     falseValue="false">
@@ -39,6 +47,7 @@
                 </div>
             </div>
         </div>
+        <!-- Add new custom field -->
         <div class="box-content-row" appBoxRow>
             <a href="#" appStopClick (click)="addField()" role="button">
                 <i class="fa fa-plus-circle fa-fw fa-lg" aria-hidden="true"></i> {{'newCustomField' | i18n}}
@@ -46,6 +55,9 @@
             <label for="addFieldType" class="sr-only">{{'type' | i18n}}</label>
             <select id="addFieldType" name="AddFieldType" [(ngModel)]="addFieldType" class="field-type">
                 <option *ngFor="let o of addFieldTypeOptions" [ngValue]="o.value">{{o.name}}</option>
+                <option *ngIf="cipher.linkedFieldOptions != null" [ngValue]="addFieldLinkedTypeOption.value">
+                    {{addFieldLinkedTypeOption.name}}
+                </option>
             </select>
         </div>
     </div>
diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html
index d7f4ecec..6a335e82 100644
--- a/src/app/vault/add-edit.component.html
+++ b/src/app/vault/add-edit.component.html
@@ -249,7 +249,7 @@
                         <label for="favorite">{{'favorite' | i18n}}</label>
                         <input id="favorite" type="checkbox" name="Favorite" [(ngModel)]="cipher.favorite">
                     </div>
-                    <div class="box-content-row box-content-row-checkbox" appBoxRow>
+                    <div class="box-content-row box-content-row-checkbox" appBoxRow *ngIf="canUseReprompt">
                         <label for="passwordPrompt">{{'passwordPrompt' | i18n}}
                             <a href="#" appA11yTitle="{{'learnMore' | i18n}}" (click)="openHelpReprompt()">
                                 <i class="fa fa-question-circle-o" aria-hidden="true"></i>
@@ -281,7 +281,8 @@
                     </div>
                 </div>
             </div>
-            <app-vault-add-edit-custom-fields [cipher]="cipher" [editMode]="editMode"></app-vault-add-edit-custom-fields>
+            <app-vault-add-edit-custom-fields [cipher]="cipher" [thisCipherType]="cipher.type" [editMode]="editMode">
+            </app-vault-add-edit-custom-fields>
             <div class="box" *ngIf="allowOwnershipOptions()">
                 <div class="box-header">
                     {{'ownership' | i18n}}
diff --git a/src/app/vault/add-edit.component.ts b/src/app/vault/add-edit.component.ts
index 491bd28f..0f6cd6eb 100644
--- a/src/app/vault/add-edit.component.ts
+++ b/src/app/vault/add-edit.component.ts
@@ -16,6 +16,7 @@ import { I18nService } from 'jslib-common/abstractions/i18n.service';
 import { LogService } from 'jslib-common/abstractions/log.service';
 import { MessagingService } from 'jslib-common/abstractions/messaging.service';
 import { OrganizationService } from 'jslib-common/abstractions/organization.service';
+import { PasswordRepromptService } from 'jslib-common/abstractions/passwordReprompt.service';
 import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
 import { PolicyService } from 'jslib-common/abstractions/policy.service';
 import { StateService } from 'jslib-common/abstractions/state.service';
@@ -38,10 +39,12 @@ export class AddEditComponent extends BaseAddEditComponent implements OnChanges,
         auditService: AuditService, stateService: StateService,
         collectionService: CollectionService, messagingService: MessagingService,
         eventService: EventService, policyService: PolicyService,
-        private broadcasterService: BroadcasterService, private ngZone: NgZone,
-        logService: LogService, organizationService: OrganizationService) {
+        passwordRepromptService: PasswordRepromptService, private broadcasterService: BroadcasterService,
+        private ngZone: NgZone, logService: LogService,
+        organizationService: OrganizationService) {
         super(cipherService, folderService, i18nService, platformUtilsService, auditService, stateService,
-            collectionService, messagingService, eventService, policyService, logService, organizationService);
+            collectionService, messagingService, eventService, policyService, logService,
+            passwordRepromptService, organizationService);
     }
 
     async ngOnInit() {
diff --git a/src/app/vault/attachments.component.html b/src/app/vault/attachments.component.html
index 9b6157ff..0c190209 100644
--- a/src/app/vault/attachments.component.html
+++ b/src/app/vault/attachments.component.html
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="attachmentsTitle">
+<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="attachmentsTitle">
     <div class="modal-dialog" role="document">
         <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
             <div class="modal-body">
diff --git a/src/app/vault/collections.component.html b/src/app/vault/collections.component.html
index ff3085d2..ca320ecb 100644
--- a/src/app/vault/collections.component.html
+++ b/src/app/vault/collections.component.html
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="collectionsTitle">
+<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="collectionsTitle">
     <div class="modal-dialog" role="document">
         <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
             <div class="modal-body">
diff --git a/src/app/vault/export.component.html b/src/app/vault/export.component.html
index d4a40436..dece1297 100644
--- a/src/app/vault/export.component.html
+++ b/src/app/vault/export.component.html
@@ -1,6 +1,6 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="exportTitle">
+<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="exportTitle">
     <div class="modal-dialog" role="document">
-        <form class="modal-content" #form (ngSubmit)="submit()">
+        <form class="modal-content" #form (ngSubmit)="submit()" [formGroup]="exportForm">
             <div class="modal-body">
                 <app-callout type="warning" title="{{'vaultExportDisabled' | i18n}}" *ngIf="disabledByPolicy">
                     {{'personalVaultExportPolicyInEffect' | i18n}}
@@ -12,25 +12,14 @@
                     <div class="box-content">
                         <div class="box-content-row" appBoxRow>
                             <label for="format">{{'fileFormat' | i18n}}</label>
-                            <select id="format" name="Format" [(ngModel)]="format" [disabled]="disabledByPolicy">
-                                <option value="json">.json</option>
-                                <option value="csv">.csv</option>
-                                <option value="encrypted_json">.json (Encrypted)</option>
+                            <select class="form-control" id="format" name="Format" formControlName="format">
+                                <option *ngFor="let f of formatOptions" [value]="f.value">{{f.name}}</option>
                             </select>
                         </div>
                         <div class="box-content-row box-content-row-flex" appBoxRow>
                             <div class="row-main">
-                                <label for="masterPassword">{{'masterPass' | i18n}}</label>
-                                <input id="masterPassword" type="{{showPassword ? 'text' : 'password'}}"
-                                    name="MasterPassword" class="monospaced" [(ngModel)]="masterPassword" required
-                                    appAutofocus [disabled]="disabledByPolicy">
-                            </div>
-                            <div class="action-buttons">
-                                <a class="row-btn" href="#" appStopClick appBlurClick role="button"
-                                    appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword()">
-                                    <i class="fa fa-lg" aria-hidden="true"
-                                        [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
-                                </a>
+                                <app-verify-master-password ngDefaultControl formControlName="secret" name="secret">
+                                </app-verify-master-password>
                             </div>
                         </div>
                     </div>
diff --git a/src/app/vault/export.component.ts b/src/app/vault/export.component.ts
index 5bfbb334..5bca04fa 100644
--- a/src/app/vault/export.component.ts
+++ b/src/app/vault/export.component.ts
@@ -1,8 +1,8 @@
 import {
     Component,
-    NgZone,
     OnInit,
 } from '@angular/core';
+import { FormBuilder } from '@angular/forms';
 
 import * as os from 'os';
 
@@ -13,6 +13,7 @@ import { I18nService } from 'jslib-common/abstractions/i18n.service';
 import { LogService } from 'jslib-common/abstractions/log.service';
 import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
 import { PolicyService } from 'jslib-common/abstractions/policy.service';
+import { UserVerificationService } from 'jslib-common/abstractions/userVerification.service';
 
 import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
 
@@ -27,34 +28,17 @@ const BroadcasterSubscriptionId = 'ExportComponent';
 export class ExportComponent extends BaseExportComponent implements OnInit {
     constructor(cryptoService: CryptoService, i18nService: I18nService,
         platformUtilsService: PlatformUtilsService, exportService: ExportService,
-        eventService: EventService, private broadcasterService: BroadcasterService,
-        private ngZone: NgZone, policyService: PolicyService,
-        logService: LogService) {
-        super(cryptoService, i18nService, platformUtilsService, exportService, eventService, policyService, window, logService);
-    }
-
-    async ngOnInit() {
-        super.ngOnInit();
-        this.broadcasterService.subscribe(BroadcasterSubscriptionId, async (message: any) => {
-            this.ngZone.run(() => {
-                switch (message.command) {
-                    case 'windowHidden':
-                        this.onWindowHidden();
-                        break;
-                    default:
-                }
-            });
-        });
+        eventService: EventService, policyService: PolicyService,
+        userVerificationService: UserVerificationService, fb: FormBuilder,
+        private broadcasterService: BroadcasterService, logService: LogService) {
+        super(cryptoService, i18nService, platformUtilsService, exportService, eventService,
+            policyService, window, logService, userVerificationService, fb);
     }
 
     ngOnDestroy() {
         this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
     }
 
-    onWindowHidden() {
-        this.showPassword = false;
-    }
-
     async warningDialog() {
         if (this.encryptedFormat) {
             return await this.platformUtilsService.showDialog(
diff --git a/src/app/vault/folder-add-edit.component.html b/src/app/vault/folder-add-edit.component.html
index cb7f416b..6ea62bef 100644
--- a/src/app/vault/folder-add-edit.component.html
+++ b/src/app/vault/folder-add-edit.component.html
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="folderAddEditTitle">
+<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="folderAddEditTitle">
     <div class="modal-dialog modal-sm" role="document">
         <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
             <div class="modal-body">
diff --git a/src/app/vault/password-generator-history.component.html b/src/app/vault/password-generator-history.component.html
index 812b3026..134f08a3 100644
--- a/src/app/vault/password-generator-history.component.html
+++ b/src/app/vault/password-generator-history.component.html
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="passwordGenHistoryTitle">
+<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="passwordGenHistoryTitle">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-body">
diff --git a/src/app/vault/password-generator.component.html b/src/app/vault/password-generator.component.html
index 465bba7e..fabc1278 100644
--- a/src/app/vault/password-generator.component.html
+++ b/src/app/vault/password-generator.component.html
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" attr.aria-label="{{'generatePassword' | i18n}}">
+<div class="modal fade" role="dialog" aria-modal="true" attr.aria-label="{{'generatePassword' | i18n}}">
     <div class="modal-dialog modal-sm" role="document">
         <div class="modal-content">
             <div class="modal-body">
diff --git a/src/app/vault/password-history.component.html b/src/app/vault/password-history.component.html
index ef242199..ae15efd6 100644
--- a/src/app/vault/password-history.component.html
+++ b/src/app/vault/password-history.component.html
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="passwordHistoryTitle">
+<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="passwordHistoryTitle">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-body">
diff --git a/src/app/vault/share.component.html b/src/app/vault/share.component.html
index 0a120dc3..f06eec31 100644
--- a/src/app/vault/share.component.html
+++ b/src/app/vault/share.component.html
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" aria-modal="true" aria-labelledby="moveToOrgTitle">
+<div class="modal fade" role="dialog" aria-modal="true" aria-labelledby="moveToOrgTitle">
     <div class="modal-dialog" role="document">
         <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
             <div class="modal-body">
diff --git a/src/app/vault/view-custom-fields.component.html b/src/app/vault/view-custom-fields.component.html
index 06494343..189fd150 100644
--- a/src/app/vault/view-custom-fields.component.html
+++ b/src/app/vault/view-custom-fields.component.html
@@ -18,6 +18,13 @@
                     <i class="fa fa-square-o" *ngIf="field.value !== 'true'" aria-hidden="true"></i>
                     <span class="sr-only">{{field.value}}</span>
                 </div>
+                <div *ngIf="field.type === fieldType.Linked" class="box-content-row-flex">
+                    <div class="icon icon-small">
+                        <i class="fa fa-link" aria-hidden="true" appA11yTitle="{{'linkedValue' | i18n}}"></i>
+                        <span class="sr-only">{{'linkedValue' | i18n}}</span>
+                    </div>
+                    <span>{{cipher.linkedFieldI18nKey(field.linkedId) | i18n}}</span>
+                </div>
             </div>
             <div class="action-buttons">
                 <a class="row-btn" href="#" appStopClick appA11yTitle="{{'toggleVisibility' | i18n}}"
@@ -27,7 +34,8 @@
                         [ngClass]="{'fa-eye': !field.showValue, 'fa-eye-slash': field.showValue}"></i>
                 </a>
                 <a class="row-btn" href="#" appStopClick appA11yTitle="{{'copyValue' | i18n}}"
-                    *ngIf="field.value && field.type !== fieldType.Boolean && !(field.type === fieldType.Hidden && !cipher.viewPassword)"
+                    *ngIf="field.value && field.type !== fieldType.Boolean && field.type !== fieldType.Linked &&
+                    !(field.type === fieldType.Hidden && !cipher.viewPassword)"
                     (click)="copy(field.value, 'value', field.type === fieldType.Hidden ? 'H_Field' : 'Field')"
                     role="button">
                     <i class="fa fa-lg fa-clone" aria-hidden="true"></i>
diff --git a/src/locales/af/messages.json b/src/locales/af/messages.json
index 2b6fbd7a..d45e74d0 100644
--- a/src/locales/af/messages.json
+++ b/src/locales/af/messages.json
@@ -1695,22 +1695,22 @@
     "message": "Hierdie aksie is beskerm. Voer u hoofwagwoord in om u identiteit te bevestig om voort te gaan."
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "Hoofwagwoord bygewerk"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "Werk hoofwagwoord by"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "U hoofwagwoord is onlangs deur ’n administrateur in u organisasie verander. Om toegang tot u kluis te verkry moet u dit nóú bywerk. Deur voort te gaan word u uit u huidige sessie geteken, waarna u weer sal moet aanteken. Aktiewe sessies op ander toestelle kan vir tot ’n uur steeds aktief bly."
   },
   "hours": {
-    "message": "Hours"
+    "message": "Uur"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "Minute"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "U organisasiebeleide beïnvloed u kluisuitelling. Maksimum toegelate kluisuittelling is $HOURS$ uur en $MINUTES$ minuut(e)",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1723,18 +1723,18 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "U kluisuittelling oorskry die beperkinge wat deur u organisasie daargestel is."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "Outomatiese inskrywing"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "Hierdie organisasie het ’n ondernemingsbeleid wat u outomaties inskryf in die terugstel van u wagwoord. Inskrywing stel organisasiebeheerders in staat om u hoofwagwoord te wysig."
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "Kluisuitstuur gedeaktiveer"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "Een of meer organisasiebeleide verhoed u om u persoonlike kluis uit te stuur."
   }
 }
diff --git a/src/locales/az/messages.json b/src/locales/az/messages.json
index d7605608..b58a9a88 100644
--- a/src/locales/az/messages.json
+++ b/src/locales/az/messages.json
@@ -45,10 +45,10 @@
     "message": "Paylaş"
   },
   "moveToOrganization": {
-    "message": "Təşkilata köçür"
+    "message": "Təşkilata daşı"
   },
   "movedItemToOrg": {
-    "message": "$ITEMNAME$ $ORGNAME$ şirkətinə köçürüldü",
+    "message": "$ITEMNAME$ $ORGNAME$ şirkətinə daşındı",
     "placeholders": {
       "itemname": {
         "content": "$1",
@@ -61,7 +61,7 @@
     }
   },
   "moveToOrgDesc": {
-    "message": "Bu elementi köçürmək istədiyiniz təşkilatı seçin. Bir təşkilata köçürmək, elementin sahibliyini də həmin təşkilata köçürəcək. Köçürdükdən sonra bu elementə birbaşa sahibliyiniz olmayacaq."
+    "message": "Bu elementi daşımaq istədiyiniz təşkilatı seçin. Bir təşkilata daşımaq, elementin sahibliyini də həmin təşkilata daşıyacaq. Daşıdıqdan sonra bu elementə birbaşa sahibliyiniz olmayacaq."
   },
   "attachments": {
     "message": "Qoşmalar"
@@ -92,7 +92,7 @@
     "message": "İstifadəçi adı"
   },
   "password": {
-    "message": "Şifrə"
+    "message": "Parol"
   },
   "passphrase": {
     "message": "Uzun ifadə"
@@ -254,7 +254,7 @@
     "message": "Digər"
   },
   "generatePassword": {
-    "message": "Şifrə yarat"
+    "message": "Parol yarat"
   },
   "type": {
     "message": "Növ"
@@ -356,7 +356,7 @@
     "message": "Element tullantı qutusuna göndərildi"
   },
   "overwritePasswordConfirmation": {
-    "message": "Hazırkı şifrənin üzərinə yazmaq istədiyinizə əminsiniz?"
+    "message": "Hazırkı parolun üzərinə yazmaq istədiyinizə əminsiniz?"
   },
   "noneFolder": {
     "message": "Qovluq yoxdur",
@@ -369,10 +369,10 @@
     "message": "Qovluğa düzəliş et"
   },
   "regeneratePassword": {
-    "message": "Şifrəni yenidən yarat"
+    "message": "Parolu yenidən yarat"
   },
   "copyPassword": {
-    "message": "Şifrəni kopyala"
+    "message": "Parolu kopyala"
   },
   "copyUri": {
     "message": "URI-ni kopyala"
@@ -474,31 +474,31 @@
     "message": "Göndər"
   },
   "masterPass": {
-    "message": "Ana şifrə"
+    "message": "Ana parol"
   },
   "masterPassDesc": {
-    "message": "Ana şifrə, anbarınıza müraciət etmək üçün istifadə edəcəyiniz şifrədir. Ana şifrəni yadda saxlamaq çox vacibdir. Unutsanız, şifrəni bərpa etməyin heç bir yolu yoxdur."
+    "message": "Ana parol, anbarınıza müraciət etmək üçün istifadə edəcəyiniz paroldur. Ana parolu yadda saxlamaq çox vacibdir. Unutsanız, parolu bərpa etməyin heç bir yolu yoxdur."
   },
   "masterPassHintDesc": {
-    "message": "Ana şifrə məsləhəti, unutduğunuz şifrənizi xatırlamağınıza kömək edir."
+    "message": "Ana parol məsləhəti, unutduğunuz parolunuzu xatırlamağınıza kömək edir."
   },
   "reTypeMasterPass": {
-    "message": "Ana şifrəni yenidən yaz"
+    "message": "Ana parolu yenidən yaz"
   },
   "masterPassHint": {
-    "message": "Ana şifrə məsləhəti (ixtiyari)"
+    "message": "Ana parol məsləhəti (ixtiyari)"
   },
   "settings": {
     "message": "Tənzimləmələr"
   },
   "passwordHint": {
-    "message": "Şifrə məsləhəti"
+    "message": "Parol məsləhəti"
   },
   "enterEmailToGetHint": {
-    "message": "Ana şifrə məsləhətini alacağınız hesabınızın e-poçt ünvanını daxil edin."
+    "message": "Ana parol məsləhətini alacağınız hesabınızın e-poçt ünvanını daxil edin."
   },
   "getMasterPasswordHint": {
-    "message": "Ana şifrə üçün məsləhət alın"
+    "message": "Ana parol üçün məsləhət alın"
   },
   "emailRequired": {
     "message": "E-poçt ünvanı lazımdır."
@@ -507,19 +507,19 @@
     "message": "Etibarsız e-poçt ünvanı."
   },
   "masterPassRequired": {
-    "message": "Ana şifrə lazımdır."
+    "message": "Ana parol lazımdır."
   },
   "masterPassLength": {
-    "message": "Ana şifrə ən azı 8 simvol uzunluğunda olmalıdır."
+    "message": "Ana parol ən azı 8 simvol uzunluğunda olmalıdır."
   },
   "masterPassDoesntMatch": {
-    "message": "Ana şifrə təsdiqləməsi uyğun gəlmir."
+    "message": "Ana parol təsdiqləməsi uyğun gəlmir."
   },
   "newAccountCreated": {
     "message": "Yeni hesabınız yaradıldı! İndi giriş edə bilərsiniz."
   },
   "masterPassSent": {
-    "message": "Ana şifrə məsləhətini ehtiva edən bir e-poçt göndərdik."
+    "message": "Ana parol məsləhətini ehtiva edən bir e-poçt göndərdik."
   },
   "unexpectedError": {
     "message": "Gözlənilməz bir səhv baş verdi."
@@ -669,7 +669,7 @@
     "message": "Xeyr"
   },
   "overwritePassword": {
-    "message": "Şifrənin üzərinə yaz"
+    "message": "Parolun üzərinə yaz"
   },
   "learnMore": {
     "message": "Daha ətraflı"
@@ -711,7 +711,7 @@
     "message": "İndi kilidlə"
   },
   "passwordGenerator": {
-    "message": "Şifrə yaradıcı"
+    "message": "Parol yaradıcı"
   },
   "emailUs": {
     "message": "Bizə məktub yazın"
@@ -732,10 +732,10 @@
     "message": "Anbarı eyniləşdir"
   },
   "changeMasterPass": {
-    "message": "Ana şifrəni dəyişdir"
+    "message": "Ana parolu dəyişdir"
   },
   "changeMasterPasswordConfirmation": {
-    "message": "Ana şifrənizi bitwarden.com veb anbarında dəyişdirə bilərsiniz. İndi saytı ziyarət etmək istəyirsiniz?"
+    "message": "Ana parolunuzu bitwarden.com veb anbarında dəyişdirə bilərsiniz. İndi saytı ziyarət etmək istəyirsiniz?"
   },
   "fingerprintPhrase": {
     "message": "Barmaq izi ifadəsi",
@@ -761,7 +761,7 @@
     "message": "Uğursuz eyniləşdirmə"
   },
   "yourVaultIsLocked": {
-    "message": "Anbarınız kilidlənib. Davam etmək üçün ana şifrənizi təsdiqləyin."
+    "message": "Anbarınız kilidlənib. Davam etmək üçün ana parolunuzu təsdiqləyin."
   },
   "unlock": {
     "message": "Kilidi aç"
@@ -780,7 +780,7 @@
     }
   },
   "invalidMasterPassword": {
-    "message": "Etibarsız ana şifrə"
+    "message": "Etibarsız ana parol"
   },
   "twoStepLoginConfirmation": {
     "message": "İki mərhələli giriş, təhlükəsizlik açarı, kimlik təsdiqləyici tətbiq, SMS, telefon zəngi və ya e-poçt kimi digər cihazlarla girişinizi təsdiqləməyinizi tələb edərək hesabınızı daha da təhlükəsiz edir. İki mərhələli giriş, bitwarden.com veb anbarında fəallaşdırıla bilər. Veb saytı indi ziyarət etmək istəyirsiniz?"
@@ -1024,7 +1024,7 @@
     "message": "YubiKey, FIDO U2F və Duo kimi iki mərhələli giriş seçimləri."
   },
   "premiumSignUpReports": {
-    "message": "Anbarınızın təhlükəsiyini təmin etmək üçün şifrə gigiyenası, hesab sağlamlığı və verilənlərin pozulması hesabatları."
+    "message": "Anbarınızın təhlükəsiyini təmin etmək üçün parol gigiyenası, hesab sağlamlığı və verilənlərin pozulması hesabatları."
   },
   "premiumSignUpTotp": {
     "message": "Anbarınızdakı hesablar üçün TOTP təsdiqləmə kodu (2FA) yaradıcısı."
@@ -1060,14 +1060,14 @@
     "message": "Təzələmə tamamlandı"
   },
   "passwordHistory": {
-    "message": "Şifrə tarixçəsi"
+    "message": "Parol tarixçəsi"
   },
   "clear": {
     "message": "Təmizlə",
     "description": "To clear something out. example: To clear browser history."
   },
   "noPasswordsInList": {
-    "message": "Siyahılanacaq heç bir şifrə yoxdur."
+    "message": "Siyahılanacaq heç bir parol yoxdur."
   },
   "undo": {
     "message": "Geri al"
@@ -1150,10 +1150,10 @@
     "message": "Pəncərə"
   },
   "checkPassword": {
-    "message": "Şifrənizin oğurlanıb oğurlanmadığını yoxlayın."
+    "message": "Parolunuzun oğurlanıb oğurlanmadığını yoxlayın."
   },
   "passwordExposed": {
-    "message": "Bu şifrə, məlumat pozuntularında $VALUE$ dəfə üzə çıxıb. Dəyişdirməyi məsləhət görürük.",
+    "message": "Bu parol, məlumat pozuntularında $VALUE$ dəfə üzə çıxıb. Dəyişdirməyi məsləhət görürük.",
     "placeholders": {
       "value": {
         "content": "$1",
@@ -1162,7 +1162,7 @@
     }
   },
   "passwordSafe": {
-    "message": "Bu şifrə, məlumat pozuntularında qeydə alınmayıb. Rahatlıqla istifadə edə bilərsiniz."
+    "message": "Bu parol, məlumat pozuntularında qeydə alınmayıb. Rahatlıqla istifadə edə bilərsiniz."
   },
   "baseDomain": {
     "message": "Baza domeni"
@@ -1218,7 +1218,7 @@
     "description": "ex. Date this item was updated"
   },
   "datePasswordUpdated": {
-    "message": "Şifrə yeniləndi",
+    "message": "Parol yeniləndi",
     "description": "ex. Date this password was updated"
   },
   "exportVault": {
@@ -1241,10 +1241,10 @@
     "message": "Bu ixrac faylı, hesabınızın şifrələmə açarını istifadə edərək verilənlərinizi şifrələyir. Hesabınızın şifrələmə açarını döndərsəniz, bu ixrac faylının şifrəsini aça bilməyəcəyiniz üçün yenidən ixrac etməli olacaqsınız."
   },
   "encExportAccountWarningDesc": {
-    "message": "Hesab şifrələmə açarları, hər Bitwarden istifadəçi hesabı üçün unikaldır, buna görə də şifrəli bir ixracı, fərqli bir hesaba idxal edə bilməzsiniz."
+    "message": "Hesab şifrələmə açarları, hər Bitwarden istifadəçi hesabı üçün unikaldır, buna görə də şifrələnmiş bir ixracı, fərqli bir hesaba idxal edə bilməzsiniz."
   },
   "exportMasterPassword": {
-    "message": "Anbar verilənlərinizi ixrac etmək üçün ana şifrənizi daxil edin."
+    "message": "Anbar verilənlərinizi ixrac etmək üçün ana parolunuzu daxil edin."
   },
   "noOrganizationsList": {
     "message": "Heç bir təşkilata aid deyilsiniz. Təşkilatlar, elementlərinizi digər istifadəçilərlə təhlükəsiz şəkildə paylaşmağınızı təmin edir."
@@ -1271,10 +1271,10 @@
     "description": "ex. A weak password. Scale: Weak -> Good -> Strong"
   },
   "weakMasterPassword": {
-    "message": "Zəif ana şifrə"
+    "message": "Zəif ana parol"
   },
   "weakMasterPasswordDesc": {
-    "message": "Seçdiyiniz ana şifrə zəifdir. Bitwarden hesabınızı daha yaxşı qorumaq üçün güclü bir ana şifrə (və ya uzun ifadə) istifadə etməlisiniz. Bu ana şifrəni istifadə etmək istədiyinizə əminsiniz?"
+    "message": "Seçdiyiniz ana parol zəifdir. Bitwarden hesabınızı daha yaxşı qorumaq üçün güclü bir ana parol (və ya uzun ifadə) istifadə etməlisiniz. Bu ana parol istifadə etmək istədiyinizə əminsiniz?"
   },
   "pin": {
     "message": "PIN",
@@ -1314,7 +1314,7 @@
     "message": "Açılışda Touch ID üçün soruşma."
   },
   "lockWithMasterPassOnRestart": {
-    "message": "Yenidən başladılanda ana şifrə ilə kilidlə"
+    "message": "Yenidən başladılanda ana parol ilə kilidlə"
   },
   "preferences": {
     "message": "Tercihlər"
@@ -1366,7 +1366,7 @@
     "message": "Anbara müraciət vaxtının bitmə əməliyyatı"
   },
   "vaultTimeoutActionLockDesc": {
-    "message": "Kilidli bir anbar, təkrar müraciət etmək üçün ana şifrənizi yenidən yazmağınızı tələb edir."
+    "message": "Kilidli bir anbar, təkrar müraciət etmək üçün ana parolunuzu yenidən yazmağınızı tələb edir."
   },
   "vaultTimeoutActionLogOutDesc": {
     "message": "Çıxış edilmiş bir anbar, təkrar müraciət etmək üçün yenidən kimlik təsdiqləmə tələb edir."
@@ -1413,19 +1413,19 @@
     "message": "Müəssisə üçün tək daxil olma"
   },
   "setMasterPassword": {
-    "message": "Ana şifrəni tənzimlə"
+    "message": "Ana parolu tənzimlə"
   },
   "ssoCompleteRegistration": {
-    "message": "SSO ilə giriş prosesini tamamlamaq üçün zəhmət olmasa anbarınıza müraciət etmək və onu qorumaq üçün bir ana şifrə tənzimləyin."
+    "message": "SSO ilə giriş prosesini tamamlamaq üçün zəhmət olmasa anbarınıza müraciət etmək və onu qorumaq üçün bir ana parol tənzimləyin."
   },
   "newMasterPass": {
-    "message": "Yeni ana şifrə"
+    "message": "Yeni ana parol"
   },
   "confirmNewMasterPass": {
-    "message": "Yeni ana şifrəni təsdiqlə"
+    "message": "Yeni ana parolu təsdiqlə"
   },
   "masterPasswordPolicyInEffect": {
-    "message": "Bir və ya daha çox təşkilat siyasəti, aşağıdakı tələbləri qarşılamaq üçün ana şifrənizi tələb edir:"
+    "message": "Bir və ya daha çox təşkilat siyasəti, aşağıdakı tələbləri qarşılamaq üçün ana parolunuzu tələb edir:"
   },
   "policyInEffectMinComplexity": {
     "message": "Minimum mürəkkəblik xalı: $SCORE$",
@@ -1464,7 +1464,7 @@
     }
   },
   "masterPasswordPolicyRequirementsNotMet": {
-    "message": "Yeni ana şifrəniz siyasət tələblərini qarşılamır."
+    "message": "Yeni ana parolunuz siyasət tələblərini qarşılamır."
   },
   "acceptPolicies": {
     "message": "Bu qutunu işarələyərək aşağıdakılarla razılaşırsınız:"
@@ -1515,7 +1515,7 @@
     "message": "Müəssisə Siyasətinə görə, elementləri şəxsi anbarınızda saxlamağınız məhdudlaşdırılıb. Sahiblik seçimini təşkilat olaraq dəyişdirin və mövcud kolleksiyalar arasından seçim edin."
   },
   "hintEqualsPassword": {
-    "message": "Şifrə məsləhəti, şifrənizlə eyni ola bilməz."
+    "message": "Parol məsləhəti, parolunuzla eyni ola bilməz."
   },
   "personalOwnershipPolicyInEffect": {
     "message": "Bir təşkilat siyasəti, sahiblik seçimlərinizə təsir edir."
@@ -1573,7 +1573,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendPasswordDesc": {
-    "message": "İstəyinizə görə istifadəçilərdən bu \"Send\"ə müraciət edərkən şifrə tələb edə bilərsiniz.",
+    "message": "İstəyinizə görə istifadəçilərdən bu \"Send\"ə müraciət edərkən parol tələb edə bilərsiniz.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendNotesDesc": {
@@ -1605,7 +1605,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "newPassword": {
-    "message": "Yeni şifrə"
+    "message": "Yeni parol"
   },
   "whatTypeOfSend": {
     "message": "\"Send\"in növü nədir?",
@@ -1686,31 +1686,31 @@
     "message": "Bu özəlliyi istifadə etmək üçün e-poçtunuzu təsdiqləməlisiniz."
   },
   "passwordPrompt": {
-    "message": "Ana şifrəni yenidə istə"
+    "message": "Ana parolu təkrar soruş"
   },
   "passwordConfirmation": {
     "message": "Ana şifrə təsdiqi"
   },
   "passwordConfirmationDesc": {
-    "message": "Bu əməliyyat qorumalıdır, davam etmək üçün zəhmət olmasa kimliyinizi təsdiqləmək üçün ana şifrənizi təkrar daxil edin."
+    "message": "Bu əməliyyat qorumalıdır, davam etmək üçün zəhmət olmasa kimliyinizi təsdiqləmək üçün ana parolunuzu təkrar daxil edin."
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "Yenilənmiş ana parol"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "Ana parolu yenilə"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "Ana parolunuz təzəlikcə təşkilatınızdakı bir administrator tərəfindən dəyişdirildi. Anbara müraciət üçün indi yeniləməlisiniz. Davam etsəniz, hazırkı seansdan çıxış etmiş və təkrar giriş etməli olacaqsınız. Digər cihazlardakı aktiv seanslar bir saata qədər aktiv qalmağa davam edə bilər."
   },
   "hours": {
-    "message": "Hours"
+    "message": "Saat"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "Dəqiqə"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "Təşkilatınızın siyasətləri, anbarınızın vaxt bitişinə təsir edir. Anbar vaxt bitişi üçün icazə verilən maksimum vaxt $HOURS$ saat $MINUTES$ dəqiqədir",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1723,18 +1723,18 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "Anbar vaxt bitişi, təşkilatınız tərəfindən tənzimlənən məhdudiyyətləri aşır."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "Avtomatik qeydiyyat"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "Bu təşkilat, sizi \"parol sıfırlama\"da avtomatik olaraq qeydiyyata alan müəssisə siyasətinə sahibdir. Qeydiyyat, təşkilat administratorlarına ana parolunuzu dəyişdirmə icazəsi verəcək."
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "Anbar ixracı sıradan çıxarıldı"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "Bir və ya daha çox təşkilat siyasəti, fərdi anbarınızı ixrac etməyinizin qarşısını alır."
   }
 }
diff --git a/src/locales/bg/messages.json b/src/locales/bg/messages.json
index f81288c7..b8a64dce 100644
--- a/src/locales/bg/messages.json
+++ b/src/locales/bg/messages.json
@@ -1695,13 +1695,13 @@
     "message": "Това действие е защитено. За да продължите, въведете отново главната си парола, за да потвърдите самоличността си."
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "Главната парола е променена"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "Промяна на главната парола"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "Вашата главна парола наскоро е била сменена от администратор в организацията Ви. За да получите достъп до трезора, трябва първо да я промените. Това означава, че ще бъдете отписан(а) от текущата си сесия и ще трябва да се впишете отново. Активните сесии на други устройства може да продължат да бъдат активни още един час."
   },
   "hours": {
     "message": "Hours"
@@ -1710,7 +1710,7 @@
     "message": "Minutes"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "Настройките на организацията Ви влияят върху времето за достъп до трезора Ви. Максималното разрешено време за достъп е $HOURS$ час(а) и $MINUTES$ минути",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1723,18 +1723,18 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "Времето за достъп до трезора Ви превишава ограничението, определено от организацията Ви."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "Автоматично включване"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "Тази организация включва автоматично новите си потребители в смяната на пароли. Това означава, че администраторите на организацията ще могат да променят главната Ви парола."
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "Изнасянето на трезора е изключено"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "Една или повече от настройките на организацията Ви не позволяват да изнасяте личния си трезор."
   }
 }
diff --git a/src/locales/ca/messages.json b/src/locales/ca/messages.json
index ec9e181d..9dae2c8c 100644
--- a/src/locales/ca/messages.json
+++ b/src/locales/ca/messages.json
@@ -1695,22 +1695,22 @@
     "message": "Aquesta acció està protegida. Per continuar, torneu a introduir la contrasenya principal per verificar la vostra identitat."
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "Contrasenya mestra actualitzada"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "Actualitza contrasenya mestra"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "Un administrador de l'organització ha canviat recentment la contrasenya principal. Per accedir a la caixa forta, heu d'actualitzar-la ara. Si continueu, es tancarà la sessió actual i heu de tornar a iniciar-la. És possible que les sessions obertes en altres dispositius continuen actives fins a una hora."
   },
   "hours": {
-    "message": "Hours"
+    "message": "Hores"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "Minuts"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "Les polítiques de l'organització afecten el temps d'espera de la caixa forta. El temps d'espera màxim permès d'aquesta és de $HOURS$ hores i $MINUTES$ minuts",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1723,18 +1723,18 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "El temps d'espera de la caixa forta supera les restriccions establertes per la vostra organització."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "Inscripció automàtica"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "Aquesta organització té una política empresarial que us inscriurà automàticament al restabliment de la contrasenya. La inscripció permetrà als administradors de l’organització canviar la vostra contrasenya mestra."
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "L'exportació de la caixa forta està desactivada"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "Una o més polítiques d'organització us impedeixen exportar la vostra caixa forta."
   }
 }
diff --git a/src/locales/da/messages.json b/src/locales/da/messages.json
index 821d2e35..9111e2fe 100644
--- a/src/locales/da/messages.json
+++ b/src/locales/da/messages.json
@@ -1695,19 +1695,19 @@
     "message": "Denne handling er beskyttet. For at fortsætte, indtast venligst din hovedadgangskode igen for at bekræfte din identitet."
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "Hovedadgangskode opdateret"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "Opdatér hovedadgangskode"
   },
   "updateMasterPasswordWarning": {
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
   "hours": {
-    "message": "Hours"
+    "message": "Timer"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "Minutter"
   },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
diff --git a/src/locales/de/messages.json b/src/locales/de/messages.json
index 4de4d49a..c6fe9933 100644
--- a/src/locales/de/messages.json
+++ b/src/locales/de/messages.json
@@ -1695,22 +1695,22 @@
     "message": "Diese Aktion ist geschützt. Um fortzufahren, gib bitte dein Master-Passwort erneut ein, um deine Identität zu bestätigen."
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "Master-Passwort aktualisiert"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "Master-Passwort aktualisieren"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "Dein Master-Passwort wurde kürzlich von einem Administrator deiner Organisation geändert. Um auf den Tresor zuzugreifen, musst du es jetzt aktualisieren. Wenn Du fortfährst, wirst du aus der aktuellen Sitzung abgemeldet und eine erneute Anmeldung ist erforderlich. Aktive Sitzungen auf anderen Geräten können bis zu einer Stunde weiterhin aktiv bleiben."
   },
   "hours": {
-    "message": "Hours"
+    "message": "Stunden"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "Minuten"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "Deine Unternehmensrichtlinien beeinflussen dein Tresor-Timeout. Das maximal zulässige Tresor-Timeout ist $HOURS$ Stunde(n) und $MINUTES$ Minute(n)",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1723,18 +1723,18 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "Dein Tresor-Timeout überschreitet die von deinem Unternehmen festgelegten Beschränkungen."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "Automatische Registrierung"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "Diese Organisation hat eine Unternehmensrichtlinie, die dich automatisch für die Passwort Zurücksetzung registriert. Die Registrierung wird es Administratoren der Organisation erlauben, dein Master-Passwort zu ändern."
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "Tresor-Export deaktiviert"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "Eine oder mehrere Unternehmensrichtlinien verhindern es, dass du deinen persönlichen Tresor exportieren kannst."
   }
 }
diff --git a/src/locales/el/messages.json b/src/locales/el/messages.json
index 721e6bbe..7afd56e1 100644
--- a/src/locales/el/messages.json
+++ b/src/locales/el/messages.json
@@ -1695,22 +1695,22 @@
     "message": "Αυτή η ενέργεια προστατεύεται. Για να συνεχίσετε, πληκτρολογήστε ξανά τον κύριο κωδικό πρόσβασης για να επαληθεύσετε την ταυτότητά σας."
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "Ενημερώθηκε ο κύριος κωδικός πρόσβασης"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "Ενημερώστε τον κύριο κωδικό πρόσβασης"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "Ο Κύριος Κωδικός Πρόσβασής σας άλλαξε πρόσφατα από διαχειριστή στον οργανισμό σας. Για να αποκτήσετε πρόσβαση στο vault, πρέπει να τον ενημερώσετε τώρα. Η διαδικασία θα σας αποσυνδέσει από την τρέχουσα συνεδρία σας, απαιτώντας από εσάς να συνδεθείτε ξανά. Οι ενεργές συνεδρίες σε άλλες συσκευές ενδέχεται να συνεχίσουν να είναι ενεργές για μία ώρα."
   },
   "hours": {
-    "message": "Hours"
+    "message": "Ώρες"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "Λεπτά"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "Οι πολιτικές του οργανισμού σας επηρεάζουν το χρονικό όριο vault σας. Το μέγιστο επιτρεπόμενο Χρονικό όριο Vault είναι $HOURS$ ώρα(ες) και $MINUTES$ λεπτό(ά)",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1723,18 +1723,18 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "Το χρονικό όριο του vault σας υπερβαίνει τους περιορισμούς που έχει ορίσει ο οργανισμός σας."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "Αυτόματη Εγγραφή"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "Αυτός ο οργανισμός έχει μια επιχειρηματική πολιτική που θα σας εγγράψει αυτόματα στην επαναφορά κωδικού. Η εγγραφή θα επιτρέψει στους διαχειριστές του οργανισμού να αλλάξουν τον κύριο κωδικό πρόσβασης σας."
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "Εξαγωγή vault Απενεργοποιημένη"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "Μία ή περισσότερες οργανωτικές πολιτικές σας αποτρέπει από την εξαγωγή του προσωπικού vault."
   }
 }
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 82e5efe9..268a75ea 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -268,6 +268,9 @@
   "lastName": {
     "message": "Last Name"
   },
+  "fullName": {
+    "message": "Full Name"
+  },
   "address1": {
     "message": "Address 1"
   },
@@ -328,6 +331,14 @@
   "cfTypeBoolean": {
     "message": "Boolean"
   },
+  "cfTypeLinked": {
+    "message": "Linked",
+    "description": "This describes a field that is 'linked' (related) to another field."
+  },
+  "linkedValue": {
+    "message": "Linked value",
+    "description": "This describes a value that is 'linked' (related) to another value."
+  },
   "remove": {
     "message": "Remove"
   },
@@ -530,12 +541,18 @@
   "noItemsInList": {
     "message": "There are no items to list."
   },
+  "requestVerificationCode": {
+    "message": "Request one-time password"
+  },
   "verificationCode": {
     "message": "Verification Code"
   },
   "verificationCodeRequired": {
     "message": "Verification code is required."
   },
+  "invalidVerificationCode": {
+    "message": "Invalid verification code"
+  },
   "continue": {
     "message": "Continue"
   },
@@ -1739,5 +1756,29 @@
   },
   "addAccount": {
     "message": "Add Account"
+  },
+  "removeMasterPassword": {
+    "message": "Remove Master Password"
+  },
+  "removedMasterPassword": {
+    "message": "Master password removed."
+  },
+  "convertOrganizationEncryptionDesc": {
+    "message": "$ORGANIZATION$ is using SSO with a self-hosted key server. A master password is no longer required to log in for members of this organization.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "My Org Name"
+      }
+    }
+  },
+  "leaveOrganization": {
+    "message": "Leave Organization"
+  },
+  "leaveOrganizationConfirmation": {
+    "message": "Are you sure you want to leave this organization?"
+  },
+  "ssoKeyConnectorUnavailable": {
+    "message": "Unable to reach the key connector, try again later."
   }
 }
diff --git a/src/locales/en_IN/messages.json b/src/locales/en_IN/messages.json
index f7dc56fd..8d1cb9e5 100644
--- a/src/locales/en_IN/messages.json
+++ b/src/locales/en_IN/messages.json
@@ -61,7 +61,7 @@
     }
   },
   "moveToOrgDesc": {
-    "message": "Choose an organisation that you wish to move this item to. Moving to an organisation transfers ownership of the item to that organistaion. You will no longer be the direct owner of this item once it has been moved."
+    "message": "Choose an organisation that you wish to move this item to. Moving to an organisation transfers ownership of the item to that organisation. You will no longer be the direct owner of this item once it has been moved."
   },
   "attachments": {
     "message": "Attachments"
@@ -350,7 +350,7 @@
     "message": "Delete attachment"
   },
   "deleteItemConfirmation": {
-    "message": "Are you sure you want to delete this item?"
+    "message": "Do you really want to send to the bin?"
   },
   "deletedItem": {
     "message": "Sent item to bin"
@@ -866,10 +866,10 @@
     "message": "When minimising the window, show an icon in the system tray instead."
   },
   "enableMinToMenuBar": {
-    "message": "Minimize to menu bar"
+    "message": "Minimise to menu bar"
   },
   "enableMinToMenuBarDesc": {
-    "message": "When minimizing the window, show an icon in the menu bar instead."
+    "message": "When minimising the window, show an icon in the menu bar instead."
   },
   "enableCloseToTray": {
     "message": "Close to tray icon"
@@ -911,7 +911,7 @@
     "message": "Always show in the Dock"
   },
   "alwaysShowDockDesc": {
-    "message": "Show the Bitwarden icon in the Dock even when minimized to the menu bar."
+    "message": "Show the Bitwarden icon in the Dock even when minimised to the menu bar."
   },
   "confirmTrayTitle": {
     "message": "Confirm disable tray"
@@ -1305,7 +1305,7 @@
     "message": "Unlock with Touch ID"
   },
   "touchIdConsentMessage": {
-    "message": "Verify for Bitwarden."
+    "message": "unlock your vault"
   },
   "noAutoPromptWindowsHello": {
     "message": "Do not prompt for Windows Hello on launch."
@@ -1470,7 +1470,7 @@
     "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."
   },
   "enableBrowserIntegration": {
     "message": "Enable browser integration"
@@ -1503,7 +1503,7 @@
     "message": "Verify browser connection"
   },
   "verifyBrowserDesc": {
-    "message": "Please ensure the shown fingerprint is identical to the fingerprint showed in the browser extension."
+    "message": "Please ensure the shown fingerprint is identical to the fingerprint shown in the browser extension."
   },
   "biometricsNotEnabledTitle": {
     "message": "Biometrics not enabled"
@@ -1512,13 +1512,13 @@
     "message": "Browser biometrics requires desktop biometrics to be enabled in the settings first."
   },
   "personalOwnershipSubmitError": {
-    "message": "Due to an Enterprise Policy, you are restricted from saving items to your personal vault. Change the Ownership option to an organization and choose from available Collections."
+    "message": "Due to an Enterprise Policy, you are restricted from saving items to your personal vault. Change the Ownership option to an organisation and choose from available Collections."
   },
   "hintEqualsPassword": {
     "message": "Your password hint cannot be the same as your password."
   },
   "personalOwnershipPolicyInEffect": {
-    "message": "An organization policy is affecting your ownership options."
+    "message": "An organisation policy is affecting your ownership options."
   },
   "allSends": {
     "message": "All Sends",
@@ -1674,10 +1674,10 @@
     "message": "Authenticate WebAuthn"
   },
   "hideEmail": {
-    "message": "Hide my email address from recepients."
+    "message": "Hide my email address from recipients."
   },
   "sendOptionsPolicyInEffect": {
-    "message": "One or more organistaion policies are affecting your Send options."
+    "message": "One or more organisation policies are affecting your Send options."
   },
   "emailVerificationRequired": {
     "message": "Email Verification Required"
@@ -1701,7 +1701,7 @@
     "message": "Update Master Password"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "Your Master Password was recently changed by an administrator in your organisation. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
   "hours": {
     "message": "Hours"
@@ -1710,7 +1710,7 @@
     "message": "Minutes"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "Your organisation policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1723,18 +1723,18 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "Your vault timeout exceeds the restrictions set by your organisation."
   },
   "resetPasswordPolicyAutoEnroll": {
     "message": "Automatic Enrollment"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "This organisation has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organisation administrators to change your master password."
   },
   "vaultExportDisabled": {
     "message": "Vault Export Disabled"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "One or more organisation policies prevents you from exporting your personal vault."
   }
 }
diff --git a/src/locales/es/messages.json b/src/locales/es/messages.json
index 46d81204..16fbd1e8 100644
--- a/src/locales/es/messages.json
+++ b/src/locales/es/messages.json
@@ -1695,22 +1695,22 @@
     "message": "Esta acción está protegida. Para continuar, vuelva a introducir su contraseña maestra para verificar su identidad."
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "Contraseña maestra actualizada"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "Actualizar contraseña maestra"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "Su contraseña maestra ha sido cambiada recientemente por un administrador de su organización. Para acceder a la caja fuerte, debe actualizarla ahora. Proceder le desconectará de su sesión actual, requiriendo que vuelva a iniciar sesión. Las sesiones activas en otros dispositivos pueden seguir estando activas durante una hora."
   },
   "hours": {
-    "message": "Hours"
+    "message": "Horas"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "Minutos"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "Las políticas de tu organización están afectando el tiempo de espera de tu caja fuerte. El máximo permitido de espera es de $HOURS$ hora(s) y de $MINUTES$ minuto(s)",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1723,18 +1723,18 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "El tiempo de espera de tu caja fuerte excede las restricciones establecidas por tu organización."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "Inscripción automática"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "Esta organización tiene una política empresarial que lo inscribirá automáticamente en el restablecimiento de contraseña. La inscripción permitirá a los administradores de la organización cambiar su contraseña maestra."
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "Exportación de caja fuerte desactivada"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "Una o más políticas de organización le impiden exportar su caja fuerte personal."
   }
 }
diff --git a/src/locales/et/messages.json b/src/locales/et/messages.json
index f1331d0c..64171455 100644
--- a/src/locales/et/messages.json
+++ b/src/locales/et/messages.json
@@ -1695,22 +1695,22 @@
     "message": "See tegevus on kaitstud. Jätkamiseks sisesta oma ülemparool."
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "Uuendas ülemparooli"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "Ülemparooli uuendamine"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "Organisatsiooni administraator muutis hiljuti sinu ülemparooli. Hoidlale ligi pääsemiseks pead seda nüüd uuendama. Jätkates logitakse sind käimasolevast sessioonist välja, misjärel nõutakse uuesti sisselogimist. Teistes seadmetes olevad aktiivsed sessioonid jäävad aktiivseks kuni üheks tunniks."
   },
   "hours": {
-    "message": "Hours"
+    "message": "Tundi"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "Minutit"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "Organisatsiooni poliitikad mõjutavad sinu hoidla ajalõppu. Maksimaalne lubatud hoidla ajalõpp on $HOURS$ tund(i) ja $MINUTES$ minut(it)",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1723,18 +1723,18 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "Valitud hoidla ajalõpp ei ole organisatsiooni poolt määratud reeglitega kooskõlas."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "Automaatne liitumine"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "Selle organisatsiooni poliitika kohaselt liidetakse sind automaatselt ülemparooli lähtestamise funktsiooniga. Liitumisel saavad organisatsiooni administraatorid sinu ülemparooli muuta."
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "Hoidla eksportimine on väljalülitatud"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "Üks või enam organisatsiooni poliitikat ei võimalda sul oma personaalset hoidlat eksportida."
   }
 }
diff --git a/src/locales/fa/messages.json b/src/locales/fa/messages.json
index 26f510e2..5dbfa916 100644
--- a/src/locales/fa/messages.json
+++ b/src/locales/fa/messages.json
@@ -1695,22 +1695,22 @@
     "message": "این عمل محافظت می شود. برای ادامه، لطفاً کلمه ورود اصلی خود را دوباره وارد کنید تا هویتان را تأیید کنید."
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "کلمه عبور اصلی بروز شد"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "بروزرسانی کلمه عبور اصلی"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "کلمه عبور اصلی شما اخیراً توسط سرپرست سازمانتان تغییر کرده است. برای دسترسی به گاوصندوق، باید همین حالا کلمه عبور اصلی خود را به روز کنید. در صورت ادامه، شما از نشست فعلی خود خارج می شوید و باید دوباره وارد سیستم شوید. نشست فعال در دستگاه های دیگر ممکن است تا یک ساعت همچنان فعال باقی بمانند."
   },
   "hours": {
-    "message": "Hours"
+    "message": "ساعت"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "دقیقه"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "خط مشی های سازمانتان بر مهلت زمانی گاوصندوق شما تأثیر می گذارد. حداکثر زمان مجاز گاوصندوق $HOURS$ ساعت و $MINUTES$ دقیقه است",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1723,18 +1723,18 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "مهلت زمانی شما بیش از محدودیت های تعیین شده توسط سازمانتان است."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "ثبت نام خودکار"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "این سازمان دارای خط مشی سازمانی ای است که به طور خودکار شما را در بازنشانی کلمه عبور ثبت نام می کند. این ثبت نام به مدیران سازمان اجازه می دهد تا کلمه عبور اصلی شما را تغییر دهند."
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "صادرات گاوصندوق غیرفعال شده است"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "یک یا چند خط مشی سازمان از صادرات گاوصندوق شخصی شما جلوگیری می کند."
   }
 }
diff --git a/src/locales/fi/messages.json b/src/locales/fi/messages.json
index efa7d20a..a90e31ec 100644
--- a/src/locales/fi/messages.json
+++ b/src/locales/fi/messages.json
@@ -1695,22 +1695,22 @@
     "message": "Toiminto on suojattu. Jatkaaksesi, syötä pääsalasanasi uudelleen vahvistaaksesi henkilöllisyytesi."
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "Pääsalasana on päivitetty"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "Päivitä pääsalasana"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "Organisaatiosi ylläpito on hiljattain vaihtanut pääsalasanasi. Käyttääksesi holvia, on sinun päivitettävä se nyt. Tämä uloskirjaa kaikki nykyiset istunnot pakottaen uudelleenkirjautumisen. Muiden laitteiden aktiiviset istunnot saattavat toimia vielä tunnin ajan."
   },
   "hours": {
-    "message": "Hours"
+    "message": "Tuntia"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "Minuuttia"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "Organisaatiosi käytännöt vaikuttavat holvisi aikakatkaisuun. Suurin sallittu viive on $HOURS$ tunti(a) ja $MINUTES$ minuutti(a)",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1723,18 +1723,18 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "Holvisi aikakatkaisuviive ylittää organisaatiosi asettamat rajoitukset."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "Automaattinen liitos"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "Organisaatiolla on käytäntö, joka liittää tilisi automaattisesti salasanan palautusapuun. Liitos sallii organisaation ylläpitäjien vaihtaa pääsalasanasi."
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "Holvin vienti on poistettu käytöstä"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "Yksi tai useampi organisaation käytäntö estää henkilökohtaisen holvisi viennin."
   }
 }
diff --git a/src/locales/he/messages.json b/src/locales/he/messages.json
index a2d23c63..d9754b52 100644
--- a/src/locales/he/messages.json
+++ b/src/locales/he/messages.json
@@ -1695,22 +1695,22 @@
     "message": "פעולה זו מוגנת. כדי להמשיך, הזן מחדש את הסיסמה הראשית שלך כדי לאמת את זהותך."
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "סיסמה ראשית עודכנה"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "עדכון סיסמה ראשית"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "הסיסמה הראשית שלך שונתה לאחרונה על ידי מנהל הארגון שלך. כדי לגשת לכספת, עליך לעדכן אותה כעת. בהמשך תנותק מההפעלה הנוכחית שלך ותידרש להיכנס שוב. הפעלות אחרות הפתוחות במכשירים שונים ימשיכו להיות פעילים עד משך שעה אחת."
   },
   "hours": {
-    "message": "Hours"
+    "message": "שעות"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "דקות"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "מדיניות הארגון שלך משפיעה על הזמן הקצוב לכספת שלך. פסק הזמן המרבי המותר לכספת הוא $HOURS$ שע(ה/ות) ו $MINUTES$ דק(ה/ות)",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1723,18 +1723,18 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "הזמן הקצוב לכספת שלך חורג מהמגבלות שנקבעו על ידי הארגון שלך."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "רישום אוטומטי"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "לארגון זה יש מדיניות ארגונית שרושמת אותך אוטומטית לאיפוס סיסמה. הרישום יאפשר למנהלי הארגון לשנות את סיסמת האב שלך."
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "ייצוא מהכספת מושבת"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "מדיניות אחת או יותר של הארגון שלך מונעות ממך לייצא את הכספת האישית שלך."
   }
 }
diff --git a/src/locales/hr/messages.json b/src/locales/hr/messages.json
index 2f51ca57..4e5d5fb2 100644
--- a/src/locales/hr/messages.json
+++ b/src/locales/hr/messages.json
@@ -1695,22 +1695,22 @@
     "message": "Ova radnja je zaštićena. Za nastavak i potvrdu identiteta, unesi svoju glavnu lozinku."
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "Glavna lozinka ažurirana"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "Ažuriraj glavnu lozinku"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "Tvoju glavnu lozinku je nedavno promijenio administrator tvoje organizacije. Za pristup trezoru, potrebno je ažurirati glavnu lozinku, što će te odjaviti iz trenutne sesije, te ćeš se morati ponovno prijaviti. Aktivne sesije na drugim uređajima mogu ostati aktivne još sat vremena."
   },
   "hours": {
-    "message": "Hours"
+    "message": "sat(i)"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "minuta"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "Pravilo tvoje organizacije utječe na istek trezora. Najveće dozvoljeno vrijeme isteka je $HOURS$:$MINUTES$ h.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1723,18 +1723,18 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "Vrijeme isteka premašuje ograničenje koju je postavila tvoja organizacija."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "Automatsko učlanjenje"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "Pravilo ove organizacija automatski će te učlaniti u ponovno postavljanje lozinke. Učlanjenje će omogućiti administratorima organizacije promjenu tvoje glavne lozinke."
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "Izvoz trezora onemogućen"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "Jedno ili više pravila organizacija onemogućuje izvoz osobnog trezora. "
   }
 }
diff --git a/src/locales/hu/messages.json b/src/locales/hu/messages.json
index 6a30a2e4..5450e47d 100644
--- a/src/locales/hu/messages.json
+++ b/src/locales/hu/messages.json
@@ -1695,22 +1695,22 @@
     "message": "Ez a művelet védett. A folytatásért ismételten meg kell adni a mesterjelszőt az személyazonosság ellenőrzéséhez."
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "A mesterjelszó frisstésre került."
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "Mesterjelszó frissítése"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "A szervezet egyik adminisztrátora nemrég megváltoztatta a mesterjelszót. A széf eléréséhez most frissíteni kell a mesterjelszót. Továbblépéskor kijelentkezés történik a jelenlegi munkamenetből és újra be kell jelentkezni. Ha van aktív munkamenet más eszközön, az még legfeljebb egy óráig aktív maradhat."
   },
   "hours": {
-    "message": "Hours"
+    "message": "Óra"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "Perc"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "A szervezeti házirendek hatással vannak a széf időkorlátjára. A széf időkorlátja legfeljebb $HOURS$ óra és $MINUTES$ perc lehet.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1723,18 +1723,18 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "A széf időkorlátja túllépi a szervezet által beállított korlátozást."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "Automatikus regisztráció"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "Ennek a szervezetnek van egy vállalati házirendje, amely automatikusan regisztrál a jelszó alaphelyzetbe állítására. A regisztráció lehetővé teszi a szervezet adminisztrátorainak a mesterjelszó megváltoztatását."
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "A széf exportálás nem engedélyezett."
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "Egy vagy több szervezeti házirend tiltja a személyes széf exportálását."
   }
 }
diff --git a/src/locales/it/messages.json b/src/locales/it/messages.json
index 2e24e466..3c125156 100644
--- a/src/locales/it/messages.json
+++ b/src/locales/it/messages.json
@@ -1695,22 +1695,22 @@
     "message": "Questa azione è protetta. Per continuare, inserisci nuovamente la tua password principale per verificare la tua identità."
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "Password principale aggiornata"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "Aggiorna password principale"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "La tua password principale è stata recentemente modificata da un amministratore nella tua organizzazione. Per accedere alla cassaforte, aggiorna ora la password. Procedendo sarai disconnesso dalla sessione attuale e ti sarà richiesto di effettuare nuovamente l'accesso. Le sessioni attive su altri dispositivi potrebbero continuare a rimanere attive per un massimo di un'ora."
   },
   "hours": {
-    "message": "Hours"
+    "message": "Ore"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "Minuti"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "Le policy dell'organizzazione stanno influenzando il timeout della tua cassaforte. Il tempo massimo consentito è di $HOURS$ ore e $MINUTES$ minuti",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1723,18 +1723,18 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "Il timeout della tua cassaforte supera i limiti impostati dalla tua organizzazione."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "Iscrizione automatica"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "Questa organizzazione ha una policy aziendale che ti iscriverà automaticamente al ripristino della password. Ciò permetterà agli amministratori dell'organizzazione di cambiare la tua password principale."
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "Esportazione cassaforte disabilitata"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "Una o più policy dell'organizzazione ti impediscono di esportare la tua cassaforte personale."
   }
 }
diff --git a/src/locales/ja/messages.json b/src/locales/ja/messages.json
index 8b96dd79..cdfa50df 100644
--- a/src/locales/ja/messages.json
+++ b/src/locales/ja/messages.json
@@ -1695,22 +1695,22 @@
     "message": "この操作は保護されています。続行するには、確認のためにマスターパスワードを再入力してください。"
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "マスターパスワードを更新しました"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "マスターパスワードを更新しました"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "マスターパスワードは最近組織の管理者によって変更されました。保管庫にアクセスするには、今すぐ更新する必要があります。 続行すると現在のセッションからログアウトし、再度ログインする必要があります。 他のデバイスでのアクティブなセッションは、最大1時間アクティブになり続けることがあります。"
   },
   "hours": {
-    "message": "Hours"
+    "message": "時間"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "分"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "あなたの組織ポリシーは保管庫のタイムアウトに影響を与えています。最大保管庫のタイムアウト時間は $HOURS$ 時間 $MINUTES$ 分です。",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1723,18 +1723,18 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "保管庫のタイムアウトが組織によって設定された制限を超えています。"
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "自動登録"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "この組織には自動的にパスワードリセットに登録するポリシーがあります。登録すると、組織の管理者はマスターパスワードを変更できます。"
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "保管庫のエクスポートは無効です"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "1 つまたは複数の組織ポリシーにより、個人の保管庫をエクスポートできません。"
   }
 }
diff --git a/src/locales/ka/messages.json b/src/locales/ka/messages.json
new file mode 100644
index 00000000..9bcec867
--- /dev/null
+++ b/src/locales/ka/messages.json
@@ -0,0 +1,1740 @@
+{
+  "bitwarden": {
+    "message": "Bitwarden"
+  },
+  "filters": {
+    "message": "Filters"
+  },
+  "allItems": {
+    "message": "All Items"
+  },
+  "favorites": {
+    "message": "Favorites"
+  },
+  "types": {
+    "message": "Types"
+  },
+  "typeLogin": {
+    "message": "Login"
+  },
+  "typeCard": {
+    "message": "Card"
+  },
+  "typeIdentity": {
+    "message": "Identity"
+  },
+  "typeSecureNote": {
+    "message": "Secure Note"
+  },
+  "folders": {
+    "message": "Folders"
+  },
+  "collections": {
+    "message": "Collections"
+  },
+  "searchVault": {
+    "message": "Search Vault"
+  },
+  "addItem": {
+    "message": "Add Item"
+  },
+  "shared": {
+    "message": "Shared"
+  },
+  "share": {
+    "message": "Share"
+  },
+  "moveToOrganization": {
+    "message": "Move to Organization"
+  },
+  "movedItemToOrg": {
+    "message": "$ITEMNAME$ moved to $ORGNAME$",
+    "placeholders": {
+      "itemname": {
+        "content": "$1",
+        "example": "Secret Item"
+      },
+      "orgname": {
+        "content": "$2",
+        "example": "Company Name"
+      }
+    }
+  },
+  "moveToOrgDesc": {
+    "message": "Choose an organization that you wish to move this item to. Moving to an organization transfers ownership of the item to that organization. You will no longer be the direct owner of this item once it has been moved."
+  },
+  "attachments": {
+    "message": "Attachments"
+  },
+  "viewItem": {
+    "message": "View Item"
+  },
+  "name": {
+    "message": "Name"
+  },
+  "uri": {
+    "message": "URI"
+  },
+  "uriPosition": {
+    "message": "URI $POSITION$",
+    "description": "A listing of URIs. Ex: URI 1, URI 2, URI 3, etc.",
+    "placeholders": {
+      "position": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "newUri": {
+    "message": "New URI"
+  },
+  "username": {
+    "message": "Username"
+  },
+  "password": {
+    "message": "Password"
+  },
+  "passphrase": {
+    "message": "Passphrase"
+  },
+  "editItem": {
+    "message": "Edit Item"
+  },
+  "emailAddress": {
+    "message": "Email Address"
+  },
+  "verificationCodeTotp": {
+    "message": "Verification Code (TOTP)"
+  },
+  "website": {
+    "message": "Website"
+  },
+  "notes": {
+    "message": "Notes"
+  },
+  "customFields": {
+    "message": "Custom Fields"
+  },
+  "launch": {
+    "message": "Launch"
+  },
+  "copyValue": {
+    "message": "Copy Value",
+    "description": "Copy value to clipboard"
+  },
+  "minimizeOnCopyToClipboard": {
+    "message": "Minimize when copying to clipboard"
+  },
+  "minimizeOnCopyToClipboardDesc": {
+    "message": "Minimize when copying an item's data to the clipboard."
+  },
+  "toggleVisibility": {
+    "message": "Toggle Visibility"
+  },
+  "toggleCollapse": {
+    "message": "Toggle Collapse",
+    "description": "Toggling an expand/collapse state."
+  },
+  "cardholderName": {
+    "message": "Cardholder Name"
+  },
+  "number": {
+    "message": "Number"
+  },
+  "brand": {
+    "message": "Brand"
+  },
+  "expiration": {
+    "message": "Expiration"
+  },
+  "securityCode": {
+    "message": "Security Code"
+  },
+  "identityName": {
+    "message": "Identity Name"
+  },
+  "company": {
+    "message": "Company"
+  },
+  "ssn": {
+    "message": "Social Security Number"
+  },
+  "passportNumber": {
+    "message": "Passport Number"
+  },
+  "licenseNumber": {
+    "message": "License Number"
+  },
+  "email": {
+    "message": "Email"
+  },
+  "phone": {
+    "message": "Phone"
+  },
+  "address": {
+    "message": "Address"
+  },
+  "premiumRequired": {
+    "message": "Premium Required"
+  },
+  "premiumRequiredDesc": {
+    "message": "A premium membership is required to use this feature."
+  },
+  "errorOccurred": {
+    "message": "An error has occurred."
+  },
+  "error": {
+    "message": "Error"
+  },
+  "january": {
+    "message": "January"
+  },
+  "february": {
+    "message": "February"
+  },
+  "march": {
+    "message": "March"
+  },
+  "april": {
+    "message": "April"
+  },
+  "may": {
+    "message": "May"
+  },
+  "june": {
+    "message": "June"
+  },
+  "july": {
+    "message": "July"
+  },
+  "august": {
+    "message": "August"
+  },
+  "september": {
+    "message": "September"
+  },
+  "october": {
+    "message": "October"
+  },
+  "november": {
+    "message": "November"
+  },
+  "december": {
+    "message": "December"
+  },
+  "ex": {
+    "message": "ex.",
+    "description": "Short abbreviation for 'example'."
+  },
+  "title": {
+    "message": "Title"
+  },
+  "mr": {
+    "message": "Mr"
+  },
+  "mrs": {
+    "message": "Mrs"
+  },
+  "ms": {
+    "message": "Ms"
+  },
+  "dr": {
+    "message": "Dr"
+  },
+  "expirationMonth": {
+    "message": "Expiration Month"
+  },
+  "expirationYear": {
+    "message": "Expiration Year"
+  },
+  "select": {
+    "message": "Select"
+  },
+  "other": {
+    "message": "Other"
+  },
+  "generatePassword": {
+    "message": "Generate Password"
+  },
+  "type": {
+    "message": "Type"
+  },
+  "firstName": {
+    "message": "First Name"
+  },
+  "middleName": {
+    "message": "Middle Name"
+  },
+  "lastName": {
+    "message": "Last Name"
+  },
+  "address1": {
+    "message": "Address 1"
+  },
+  "address2": {
+    "message": "Address 2"
+  },
+  "address3": {
+    "message": "Address 3"
+  },
+  "cityTown": {
+    "message": "City / Town"
+  },
+  "stateProvince": {
+    "message": "State / Province"
+  },
+  "zipPostalCode": {
+    "message": "Zip / Postal Code"
+  },
+  "country": {
+    "message": "Country"
+  },
+  "save": {
+    "message": "Save"
+  },
+  "cancel": {
+    "message": "Cancel"
+  },
+  "delete": {
+    "message": "Delete"
+  },
+  "favorite": {
+    "message": "Favorite"
+  },
+  "edit": {
+    "message": "Edit"
+  },
+  "authenticatorKeyTotp": {
+    "message": "Authenticator Key (TOTP)"
+  },
+  "folder": {
+    "message": "Folder"
+  },
+  "newCustomField": {
+    "message": "New Custom Field"
+  },
+  "value": {
+    "message": "Value"
+  },
+  "dragToSort": {
+    "message": "Drag to sort"
+  },
+  "cfTypeText": {
+    "message": "Text"
+  },
+  "cfTypeHidden": {
+    "message": "Hidden"
+  },
+  "cfTypeBoolean": {
+    "message": "Boolean"
+  },
+  "remove": {
+    "message": "Remove"
+  },
+  "nameRequired": {
+    "message": "Name is required."
+  },
+  "addedItem": {
+    "message": "Added item"
+  },
+  "editedItem": {
+    "message": "Edited item"
+  },
+  "deleteItem": {
+    "message": "Delete Item"
+  },
+  "deleteFolder": {
+    "message": "Delete Folder"
+  },
+  "deleteAttachment": {
+    "message": "Delete Attachment"
+  },
+  "deleteItemConfirmation": {
+    "message": "Do you really want to send to the trash?"
+  },
+  "deletedItem": {
+    "message": "Sent item to trash"
+  },
+  "overwritePasswordConfirmation": {
+    "message": "Are you sure you want to overwrite the current password?"
+  },
+  "noneFolder": {
+    "message": "No Folder",
+    "description": "This is the folder for uncategorized items"
+  },
+  "addFolder": {
+    "message": "Add Folder"
+  },
+  "editFolder": {
+    "message": "Edit Folder"
+  },
+  "regeneratePassword": {
+    "message": "Regenerate Password"
+  },
+  "copyPassword": {
+    "message": "Copy Password"
+  },
+  "copyUri": {
+    "message": "Copy URI"
+  },
+  "copyVerificationCodeTotp": {
+    "message": "Copy Verification Code (TOTP)"
+  },
+  "length": {
+    "message": "Length"
+  },
+  "numWords": {
+    "message": "Number of Words"
+  },
+  "wordSeparator": {
+    "message": "Word Separator"
+  },
+  "capitalize": {
+    "message": "Capitalize",
+    "description": "Make the first letter of a work uppercase."
+  },
+  "includeNumber": {
+    "message": "Include Number"
+  },
+  "close": {
+    "message": "Close"
+  },
+  "minNumbers": {
+    "message": "Minimum Numbers"
+  },
+  "minSpecial": {
+    "message": "Minimum Special",
+    "description": "Minimum Special Characters"
+  },
+  "ambiguous": {
+    "message": "Avoid Ambiguous Characters"
+  },
+  "searchCollection": {
+    "message": "Search Collection"
+  },
+  "searchFolder": {
+    "message": "Search Folder"
+  },
+  "searchFavorites": {
+    "message": "Search Favorites"
+  },
+  "searchType": {
+    "message": "Search Type",
+    "description": "Search item type"
+  },
+  "newAttachment": {
+    "message": "Add New Attachment"
+  },
+  "deletedAttachment": {
+    "message": "Deleted attachment"
+  },
+  "deleteAttachmentConfirmation": {
+    "message": "Are you sure you want to delete this attachment?"
+  },
+  "attachmentSaved": {
+    "message": "The attachment has been saved."
+  },
+  "file": {
+    "message": "File"
+  },
+  "selectFile": {
+    "message": "Select a file."
+  },
+  "maxFileSize": {
+    "message": "Maximum file size is 500 MB."
+  },
+  "updateKey": {
+    "message": "You cannot use this feature until you update your encryption key."
+  },
+  "options": {
+    "message": "Options"
+  },
+  "editedFolder": {
+    "message": "Edited folder"
+  },
+  "addedFolder": {
+    "message": "Added folder"
+  },
+  "deleteFolderConfirmation": {
+    "message": "Are you sure you want to delete this folder?"
+  },
+  "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."
+  },
+  "webAuthnTitle": {
+    "message": "FIDO2 WebAuthn"
+  },
+  "webAuthnDesc": {
+    "message": "Use any WebAuthn enabled security key to access your account."
+  },
+  "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": "Two-step Login Options"
+  },
+  "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": "Server URL"
+  },
+  "apiUrl": {
+    "message": "API Server URL"
+  },
+  "webVaultUrl": {
+    "message": "Web Vault Server URL"
+  },
+  "identityUrl": {
+    "message": "Identity Server URL"
+  },
+  "notificationsUrl": {
+    "message": "Notifications Server URL"
+  },
+  "iconsUrl": {
+    "message": "Icons Server URL"
+  },
+  "environmentSaved": {
+    "message": "The environment URLs have been saved."
+  },
+  "ok": {
+    "message": "Ok"
+  },
+  "yes": {
+    "message": "Yes"
+  },
+  "no": {
+    "message": "No"
+  },
+  "overwritePassword": {
+    "message": "Overwrite Password"
+  },
+  "learnMore": {
+    "message": "Learn more"
+  },
+  "featureUnavailable": {
+    "message": "Feature Unavailable"
+  },
+  "loggedOut": {
+    "message": "Logged out"
+  },
+  "loginExpired": {
+    "message": "Your login session has expired."
+  },
+  "logOutConfirmation": {
+    "message": "Are you sure you want to log out?"
+  },
+  "logOut": {
+    "message": "Log Out"
+  },
+  "addNewLogin": {
+    "message": "Add New Login"
+  },
+  "addNewItem": {
+    "message": "Add New Item"
+  },
+  "addNewFolder": {
+    "message": "Add New Folder"
+  },
+  "view": {
+    "message": "View"
+  },
+  "account": {
+    "message": "Account"
+  },
+  "loading": {
+    "message": "Loading..."
+  },
+  "lockNow": {
+    "message": "Lock Now"
+  },
+  "passwordGenerator": {
+    "message": "Password Generator"
+  },
+  "emailUs": {
+    "message": "Email Us"
+  },
+  "visitOurWebsite": {
+    "message": "Visit Our Website"
+  },
+  "fileBugReport": {
+    "message": "File a Bug Report"
+  },
+  "blog": {
+    "message": "Blog"
+  },
+  "followUs": {
+    "message": "Follow Us"
+  },
+  "syncVault": {
+    "message": "Sync Vault"
+  },
+  "changeMasterPass": {
+    "message": "Change Master Password"
+  },
+  "changeMasterPasswordConfirmation": {
+    "message": "You can change your master password on the bitwarden.com web vault. Do you want to visit the website now?"
+  },
+  "fingerprintPhrase": {
+    "message": "Fingerprint Phrase",
+    "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",
+    "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": "Go To Web Vault"
+  },
+  "getMobileApp": {
+    "message": "Get Mobile App"
+  },
+  "getBrowserExtension": {
+    "message": "Get Browser Extension"
+  },
+  "syncingComplete": {
+    "message": "Syncing complete"
+  },
+  "syncingFailed": {
+    "message": "Syncing failed"
+  },
+  "yourVaultIsLocked": {
+    "message": "Your vault is locked. Verify your master password to continue."
+  },
+  "unlock": {
+    "message": "Unlock"
+  },
+  "loggedInAsOn": {
+    "message": "Logged in as $EMAIL$ on $HOSTNAME$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      },
+      "hostname": {
+        "content": "$2",
+        "example": "bitwarden.com"
+      }
+    }
+  },
+  "invalidMasterPassword": {
+    "message": "Invalid master password"
+  },
+  "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": "Two-step Login"
+  },
+  "vaultTimeout": {
+    "message": "Vault Timeout"
+  },
+  "vaultTimeoutDesc": {
+    "message": "Choose when your vault will timeout and perform the selected action."
+  },
+  "immediately": {
+    "message": "Immediately"
+  },
+  "tenSeconds": {
+    "message": "10 seconds"
+  },
+  "twentySeconds": {
+    "message": "20 seconds"
+  },
+  "thirtySeconds": {
+    "message": "30 seconds"
+  },
+  "oneMinute": {
+    "message": "1 minute"
+  },
+  "twoMinutes": {
+    "message": "2 minutes"
+  },
+  "fiveMinutes": {
+    "message": "5 minutes"
+  },
+  "fifteenMinutes": {
+    "message": "15 minutes"
+  },
+  "thirtyMinutes": {
+    "message": "30 minutes"
+  },
+  "oneHour": {
+    "message": "1 hour"
+  },
+  "fourHours": {
+    "message": "4 hours"
+  },
+  "onIdle": {
+    "message": "On System Idle"
+  },
+  "onSleep": {
+    "message": "On System Sleep"
+  },
+  "onLocked": {
+    "message": "On System Lock"
+  },
+  "onRestart": {
+    "message": "On Restart"
+  },
+  "never": {
+    "message": "Never"
+  },
+  "security": {
+    "message": "Security"
+  },
+  "clearClipboard": {
+    "message": "Clear Clipboard",
+    "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
+  },
+  "clearClipboardDesc": {
+    "message": "Automatically clear copied values from your clipboard.",
+    "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
+  },
+  "disableFavicon": {
+    "message": "Disable Website Icons"
+  },
+  "disableFaviconDesc": {
+    "message": "Website Icons provide a recognizable image next to each login item in your vault."
+  },
+  "enableMinToTray": {
+    "message": "Minimize to Tray Icon"
+  },
+  "enableMinToTrayDesc": {
+    "message": "When minimizing the window, show an icon in the system tray instead."
+  },
+  "enableMinToMenuBar": {
+    "message": "Minimize to menu bar"
+  },
+  "enableMinToMenuBarDesc": {
+    "message": "When minimizing the window, show an icon in the menu bar instead."
+  },
+  "enableCloseToTray": {
+    "message": "Close to Tray Icon"
+  },
+  "enableCloseToTrayDesc": {
+    "message": "When closing the window, show an icon in the system tray instead."
+  },
+  "enableCloseToMenuBar": {
+    "message": "Close to menu bar"
+  },
+  "enableCloseToMenuBarDesc": {
+    "message": "When closing the window, show an icon in the menu bar 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."
+  },
+  "startToMenuBar": {
+    "message": "Start to menu bar"
+  },
+  "startToMenuBarDesc": {
+    "message": "When the application is first started, only show an icon in the menu bar."
+  },
+  "openAtLogin": {
+    "message": "Start automatically on login"
+  },
+  "openAtLoginDesc": {
+    "message": "Start the Bitwarden Desktop application automatically on login."
+  },
+  "alwaysShowDock": {
+    "message": "Always show in the Dock"
+  },
+  "alwaysShowDockDesc": {
+    "message": "Show the Bitwarden icon in the Dock even when minimized to the menu bar."
+  },
+  "confirmTrayTitle": {
+    "message": "Confirm disable tray"
+  },
+  "confirmTrayDesc": {
+    "message": "Disabling this setting will also disable all other tray related settings."
+  },
+  "language": {
+    "message": "Language"
+  },
+  "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": "Purchase Premium"
+  },
+  "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": "Refresh complete"
+  },
+  "passwordHistory": {
+    "message": "Password History"
+  },
+  "clear": {
+    "message": "Clear",
+    "description": "To clear something out. example: To clear browser history."
+  },
+  "noPasswordsInList": {
+    "message": "There are no passwords to list."
+  },
+  "undo": {
+    "message": "Undo"
+  },
+  "redo": {
+    "message": "Redo"
+  },
+  "cut": {
+    "message": "Cut",
+    "description": "Cut to clipboard"
+  },
+  "paste": {
+    "message": "Paste",
+    "description": "Paste from clipboard"
+  },
+  "selectAll": {
+    "message": "Select All"
+  },
+  "zoomIn": {
+    "message": "Zoom In"
+  },
+  "zoomOut": {
+    "message": "Zoom Out"
+  },
+  "resetZoom": {
+    "message": "Reset Zoom"
+  },
+  "toggleFullScreen": {
+    "message": "Toggle Full Screen"
+  },
+  "reload": {
+    "message": "Reload"
+  },
+  "toggleDevTools": {
+    "message": "Toggle Developer Tools"
+  },
+  "minimize": {
+    "message": "Minimize",
+    "description": "Minimize window"
+  },
+  "zoom": {
+    "message": "Zoom"
+  },
+  "bringAllToFront": {
+    "message": "Bring All to Front",
+    "description": "Bring all windows to front (foreground)"
+  },
+  "aboutBitwarden": {
+    "message": "About Bitwarden"
+  },
+  "services": {
+    "message": "Services"
+  },
+  "hideBitwarden": {
+    "message": "Hide Bitwarden"
+  },
+  "hideOthers": {
+    "message": "Hide Others"
+  },
+  "showAll": {
+    "message": "Show All"
+  },
+  "quitBitwarden": {
+    "message": "Quit Bitwarden"
+  },
+  "valueCopied": {
+    "message": "$VALUE$ copied",
+    "description": "Value has been copied to the clipboard.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "Password"
+      }
+    }
+  },
+  "help": {
+    "message": "Help"
+  },
+  "window": {
+    "message": "Window"
+  },
+  "checkPassword": {
+    "message": "Check if password has been exposed."
+  },
+  "passwordExposed": {
+    "message": "This password has been exposed $VALUE$ time(s) in data breaches. You should change it.",
+    "placeholders": {
+      "value": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "passwordSafe": {
+    "message": "This password was not found in any known data breaches. It should be safe to use."
+  },
+  "baseDomain": {
+    "message": "Base domain"
+  },
+  "host": {
+    "message": "Host",
+    "description": "A URL's host value. For example, the host of https://sub.domain.com:443 is 'sub.domain.com:443'."
+  },
+  "exact": {
+    "message": "Exact"
+  },
+  "startsWith": {
+    "message": "Starts with"
+  },
+  "regEx": {
+    "message": "Regular expression",
+    "description": "A programming term, also known as 'RegEx'."
+  },
+  "matchDetection": {
+    "message": "Match Detection",
+    "description": "URI match detection for auto-fill."
+  },
+  "defaultMatchDetection": {
+    "message": "Default match detection",
+    "description": "Default URI match detection for auto-fill."
+  },
+  "toggleOptions": {
+    "message": "Toggle Options"
+  },
+  "organization": {
+    "message": "Organization",
+    "description": "An entity of multiple related people (ex. a team or business organization)."
+  },
+  "default": {
+    "message": "Default"
+  },
+  "exit": {
+    "message": "Exit"
+  },
+  "showHide": {
+    "message": "Show / Hide",
+    "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": "Always on Top",
+    "description": "Application window should always stay on top of other windows"
+  },
+  "dateUpdated": {
+    "message": "Updated",
+    "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)"
+  },
+  "confirmVaultExport": {
+    "message": "Confirm Vault Export"
+  },
+  "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."
+  },
+  "encExportKeyWarningDesc": {
+    "message": "This export encrypts your data using your account's encryption key. If you ever rotate your account's encryption key you should export again since you will not be able to decrypt this export file."
+  },
+  "encExportAccountWarningDesc": {
+    "message": "Account encryption keys are unique to each Bitwarden user account, so you can't import an encrypted export into a different account."
+  },
+  "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": "unlock your vault"
+  },
+  "noAutoPromptWindowsHello": {
+    "message": "Do not prompt for Windows Hello on launch."
+  },
+  "noAutoPromptTouchId": {
+    "message": "Do not prompt for Touch ID on launch."
+  },
+  "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": "Trash",
+    "description": "Noun: a special folder to hold deleted items"
+  },
+  "searchTrash": {
+    "message": "Search trash"
+  },
+  "permanentlyDeleteItem": {
+    "message": "Permanently Delete Item"
+  },
+  "permanentlyDeleteItemConfirmation": {
+    "message": "Are you sure you want to permanently delete this item?"
+  },
+  "permanentlyDeletedItem": {
+    "message": "Permanently Deleted item"
+  },
+  "restoreItem": {
+    "message": "Restore Item"
+  },
+  "restoreItemConfirmation": {
+    "message": "Are you sure you want to restore this item?"
+  },
+  "restoredItem": {
+    "message": "Restored Item"
+  },
+  "permanentlyDelete": {
+    "message": "Permanently Delete"
+  },
+  "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": "Set Master Password"
+  },
+  "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"
+  },
+  "confirmNewMasterPass": {
+    "message": "Confirm New Master Password"
+  },
+  "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": "Contain one or more numbers"
+  },
+  "policyInEffectSpecial": {
+    "message": "Contain one or more of the following special characters $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."
+  },
+  "enableBrowserIntegration": {
+    "message": "Enable browser integration"
+  },
+  "enableBrowserIntegrationDesc": {
+    "message": "Browser integration is used for biometrics in browser."
+  },
+  "browserIntegrationMasOnlyTitle": {
+    "message": "Browser integration not supported"
+  },
+  "browserIntegrationMasOnlyDesc": {
+    "message": "Unfortunately browser integration is only supported in the Mac App Store version for now."
+  },
+  "browserIntegrationWindowsStoreTitle": {
+    "message": "Browser integration not supported"
+  },
+  "browserIntegrationWindowsStoreDesc": {
+    "message": "Unfortunately browser integration is currently not supported in the Windows Store version."
+  },
+  "enableBrowserIntegrationFingerprint": {
+    "message": "Require verification for browser integration"
+  },
+  "enableBrowserIntegrationFingerprintDesc": {
+    "message": "Enable an additional layer of security by requiring fingerprint phrase validation when establishing a link between your desktop and browser. When enabled, this requires user intervention and verification each time a connection is established."
+  },
+  "approve": {
+    "message": "Approve"
+  },
+  "verifyBrowserTitle": {
+    "message": "Verify browser connection"
+  },
+  "verifyBrowserDesc": {
+    "message": "Please ensure the shown fingerprint is identical to the fingerprint showed in the browser extension."
+  },
+  "biometricsNotEnabledTitle": {
+    "message": "Biometrics not enabled"
+  },
+  "biometricsNotEnabledDesc": {
+    "message": "Browser biometrics requires desktop biometrics to be enabled in the settings first."
+  },
+  "personalOwnershipSubmitError": {
+    "message": "Due to an Enterprise Policy, you are restricted from saving items to your personal vault. Change the Ownership option to an organization and choose from available Collections."
+  },
+  "hintEqualsPassword": {
+    "message": "Your password hint cannot be the same as your password."
+  },
+  "personalOwnershipPolicyInEffect": {
+    "message": "An organization policy is affecting your ownership options."
+  },
+  "allSends": {
+    "message": "All Sends",
+    "description": "'Sends' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendTypeFile": {
+    "message": "File"
+  },
+  "sendTypeText": {
+    "message": "Text"
+  },
+  "searchSends": {
+    "message": "Search Sends",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "editSend": {
+    "message": "Edit Send",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "myVault": {
+    "message": "My Vault"
+  },
+  "text": {
+    "message": "Text"
+  },
+  "deletionDate": {
+    "message": "Deletion Date"
+  },
+  "deletionDateDesc": {
+    "message": "The Send will be permanently deleted on the specified date and time.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "expirationDate": {
+    "message": "Expiration Date"
+  },
+  "expirationDateDesc": {
+    "message": "If set, access to this Send will expire on the specified date and time.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "maxAccessCount": {
+    "message": "Maximum Access Count"
+  },
+  "maxAccessCountDesc": {
+    "message": "If set, users will no longer be able to access this Send once the maximum access count is reached.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "currentAccessCount": {
+    "message": "Current Access Count"
+  },
+  "disableSend": {
+    "message": "Disable this Send so that no one can access it.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendPasswordDesc": {
+    "message": "Optionally require a password for users to access this Send.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendNotesDesc": {
+    "message": "Private notes about this Send.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendLink": {
+    "message": "Send link",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendLinkLabel": {
+    "message": "Send Link",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "textHiddenByDefault": {
+    "message": "When accessing the Send, hide the text by default",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "createdSend": {
+    "message": "Created Send",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "editedSend": {
+    "message": "Edited Send",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "deletedSend": {
+    "message": "Deleted Send",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "newPassword": {
+    "message": "New Password"
+  },
+  "whatTypeOfSend": {
+    "message": "What type of Send is this?",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "createSend": {
+    "message": "Create Send",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendTextDesc": {
+    "message": "The text you want to send."
+  },
+  "sendFileDesc": {
+    "message": "The file you want to send."
+  },
+  "days": {
+    "message": "$DAYS$ days",
+    "placeholders": {
+      "days": {
+        "content": "$1",
+        "example": "1"
+      }
+    }
+  },
+  "oneDay": {
+    "message": "1 day"
+  },
+  "custom": {
+    "message": "Custom"
+  },
+  "deleteSendConfirmation": {
+    "message": "Are you sure you want to delete this Send?",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "copySendLinkToClipboard": {
+    "message": "Copy Send link to clipboard",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "copySendLinkOnSave": {
+    "message": "Copy the link to share this Send to my clipboard upon save."
+  },
+  "sendDisabled": {
+    "message": "Send disabled",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "sendDisabledWarning": {
+    "message": "Due to an enterprise policy, you are only able to delete an existing Send.",
+    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
+  },
+  "copyLink": {
+    "message": "Copy link"
+  },
+  "disabled": {
+    "message": "Disabled"
+  },
+  "maxAccessCountReached": {
+    "message": "Max access count reached"
+  },
+  "expired": {
+    "message": "Expired"
+  },
+  "pendingDeletion": {
+    "message": "Pending deletion"
+  },
+  "webAuthnAuthenticate": {
+    "message": "Authenticate WebAuthn"
+  },
+  "hideEmail": {
+    "message": "Hide my email address from recipients."
+  },
+  "sendOptionsPolicyInEffect": {
+    "message": "One or more organization policies are affecting your Send options."
+  },
+  "emailVerificationRequired": {
+    "message": "Email Verification Required"
+  },
+  "emailVerificationRequiredDesc": {
+    "message": "You must verify your email to use this feature."
+  },
+  "passwordPrompt": {
+    "message": "Master password re-prompt"
+  },
+  "passwordConfirmation": {
+    "message": "Master password confirmation"
+  },
+  "passwordConfirmationDesc": {
+    "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
+  },
+  "updatedMasterPassword": {
+    "message": "Updated Master Password"
+  },
+  "updateMasterPassword": {
+    "message": "Update Master Password"
+  },
+  "updateMasterPasswordWarning": {
+    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+  },
+  "hours": {
+    "message": "Hours"
+  },
+  "minutes": {
+    "message": "Minutes"
+  },
+  "vaultTimeoutPolicyInEffect": {
+    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "placeholders": {
+      "hours": {
+        "content": "$1",
+        "example": "5"
+      },
+      "minutes": {
+        "content": "$2",
+        "example": "5"
+      }
+    }
+  },
+  "vaultTimeoutTooLarge": {
+    "message": "Your vault timeout exceeds the restrictions set by your organization."
+  },
+  "resetPasswordPolicyAutoEnroll": {
+    "message": "Automatic Enrollment"
+  },
+  "resetPasswordAutoEnrollInviteWarning": {
+    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+  },
+  "vaultExportDisabled": {
+    "message": "Vault Export Disabled"
+  },
+  "personalVaultExportPolicyInEffect": {
+    "message": "One or more organization policies prevents you from exporting your personal vault."
+  }
+}
diff --git a/src/locales/ko/messages.json b/src/locales/ko/messages.json
index 67106297..766e603d 100644
--- a/src/locales/ko/messages.json
+++ b/src/locales/ko/messages.json
@@ -1695,22 +1695,22 @@
     "message": "이 작업은 보호되어 있습니다. 계속하려면 마스터 비밀번호를 입력하여 신원을 인증하세요."
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "마스터 비밀번호 변경됨"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "마스터 비밀번호 변경"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "최근에 조직 관리자가 마스터 비밀번호를 변경했습니다. 보관함에 액세스하려면 지금 업데이트해야 합니다. 계속하면 현재 세션에서 로그아웃되며 다시 로그인해야 합니다. 다른 장치의 활성 세션은 최대 1시간 동안 계속 활성 상태로 유지될 수 있습니다."
   },
   "hours": {
-    "message": "Hours"
+    "message": "시"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "분"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "조직 정책이 보관함 제한 시간에 영향을 미치고 있습니다. 최대 허용 보관함 제한 시간은 $HOURS$시간 $MINUTES$분입니다",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1723,18 +1723,18 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "볼트 제한 시간이 조직에서 설정한 제한을 초과합니다."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "자동 등록"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "이 조직에는 자동으로 비밀번호 재설정에 등록하는 기업 정책이 있습니다. 등록하면 조직 관리자가 마스터 암호를 변경할 수 있습니다."
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "보관함 내보내기 비활성화됨"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "하나 이상의 조직 정책이 개인 보관함을 내보내는 것을 제한하고 있습니다."
   }
 }
diff --git a/src/locales/lv/messages.json b/src/locales/lv/messages.json
index 344e7d66..97d87190 100644
--- a/src/locales/lv/messages.json
+++ b/src/locales/lv/messages.json
@@ -1695,22 +1695,22 @@
     "message": "Šī darbība ir aizsargāta. Lai turpinātu, ir jāievada galvenā parole, lai apstiprinātu identitāti."
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "Galvenā parole atjaunināta"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "Atjaunināt galveno paroli"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "Apvienības pārvaldnieks nesen nomainīja galveno paroli. Lai piekļūtu glabātavai, tā ir jāatjaunina. Turpinot tiks izbeigta pašreizējā sesija un tiks pieprasīta atkārtota pierakstīšanās. Esošās sesijas citās iekārtās var turpināt darboties līdz vienai stundai."
   },
   "hours": {
-    "message": "Hours"
+    "message": "Stundas"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "Minūtes"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "Apvienības nosacījumi ietekmē glabātavas noildzi. Lielākā atļautā glabātavas noildze ir $HOURS$ stunda(s) un $MINUTES$ minūte(s)",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1723,18 +1723,18 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "Glabātavas noildze pāŗsniedz apvienības uzstādītos ierobežojumus."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "Automātiska ievietošana sarakstā"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "Šajā apvienībā ir uzņēmuma nosacījums, kas automātiski ievieto lietotājus paroles atiestatīšanas sarakstā. Tas ļauj apvienības pārvaldniekiem mainīt lietotāju galveno paroli."
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "Glabātavas izdošana ir atspējota"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "Viens vai vairāki apvienības nosacījumi neļauj izdot privātās glabātavas saturu."
   }
 }
diff --git a/src/locales/nl/messages.json b/src/locales/nl/messages.json
index 61fc9bfb..72e1fb10 100644
--- a/src/locales/nl/messages.json
+++ b/src/locales/nl/messages.json
@@ -1695,22 +1695,22 @@
     "message": "Deze actie is beveiligd. Voer je hoofdwachtwoord opnieuw in om je identiteit vast te stellen en door te gaan."
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "Hoofdwachtwoord bijgewerkt"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "Hoofdwachtwoord bijgewerken"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "Je hoofdwachtwoord is onlangs veranderd door een beheerder in jouw organisatie. Om toegang te krijgen tot de kluis, moet je deze nu bijwerken. Doorgaan zal je huidige sessie uitloggen, waarna je opnieuw moet inloggen. Actieve sessies op andere apparaten blijven mogelijk nog een uur actief."
   },
   "hours": {
-    "message": "Hours"
+    "message": "Uren"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "Minuten"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "Het beleid van je organisatie heeft invloed op de time-out van je kluis. De maximaal toegestane Kluis Time-out is $HOURS$ uur en $MINUTES$ minuten",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1723,18 +1723,18 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "Je kluis time-out is hoger dan het maximum van jouw organisatie."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "Automatische inschrijving"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "Deze organisatie heeft een ondernemingsbeleid dat je automatisch inschrijft bij het resetten van je wachtwoord. Inschrijving stelt organisatiebeheerders in staat om je hoofdwachtwoord te wijzigen."
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "Kluis exporteren uitgeschakeld"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "Organisatiebeleid voorkomt dat je je persoonlijke kluis exporteert."
   }
 }
diff --git a/src/locales/pl/messages.json b/src/locales/pl/messages.json
index 470b6474..52c238ed 100644
--- a/src/locales/pl/messages.json
+++ b/src/locales/pl/messages.json
@@ -1416,7 +1416,7 @@
     "message": "Ustaw hasło główne"
   },
   "ssoCompleteRegistration": {
-    "message": "Aby zakończyć logowanie jednokrotne SSO, ustaw hasło główne, aby uzyskać dostęp do sejfu."
+    "message": "W celu zakończenia jednokrotnego logowania SSO, ustaw hasło główne, aby uzyskać dostęp do sejfu."
   },
   "newMasterPass": {
     "message": "Nowe hasło główne"
@@ -1695,22 +1695,22 @@
     "message": "Ta operacja jest chroniona. Aby kontynuować, wpisz ponownie hasło główne."
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "Hasło główne zostało zaktualizowane"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "Zaktualizuj hasło główne"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "Hasło główne zostało zmienione przez administratora Twojej organizacji. Musisz je zaktualizować, aby uzyskać dostęp do sejfu. Ta czynność spowoduje wylogowanie z bieżącej sesji, przez co konieczne będzie ponowne zalogowanie się. Aktywne sesje na innych urządzeniach mogą pozostać aktywne przez maksymalnie godzinę."
   },
   "hours": {
-    "message": "Hours"
+    "message": "Godziny"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "Minuty"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "Zasady organizacji mają wpływ czas blokowania sejfu. Maksymalny dozwolony czas wynosi $HOURS$ godz. i $MINUTES$ min.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1723,18 +1723,18 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "Czas blokowania sejfu przekracza limit określony przez organizację."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "Automatyczne rejestrowanie użytkowników do resetowania hasła"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "Ta organizacja posługuje się zasadą, która automatycznie rejestruje użytkowników do resetowania hasła. Rejestracja umożliwia administratorom organizacji zmianę Twojego hasła głównego."
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "Eksportowanie sejfu zostało wyłączone"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "Co najmniej jedna zasada organizacji uniemożliwia wyeksportowanie Twojego sejfu."
   }
 }
diff --git a/src/locales/pt_BR/messages.json b/src/locales/pt_BR/messages.json
index 503cd808..918fc407 100644
--- a/src/locales/pt_BR/messages.json
+++ b/src/locales/pt_BR/messages.json
@@ -1695,22 +1695,22 @@
     "message": "Esta ação está protegida. Para continuar, por favor, reinsira a sua senha mestra para verificar sua identidade."
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "Senha Mestra Atualizada"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "Atualizar Senha Mestra"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "Sua Senha Mestra foi alterada recentemente por um administrador de sua organização. Para acessar o cofre, você precisa atualizá-la agora. O processo desconectará você da sessão atual, exigindo que você inicie a sessão novamente. Sessões ativas em outros dispositivos podem continuar ativas por até uma hora."
   },
   "hours": {
-    "message": "Hours"
+    "message": "Horas"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "Minutos"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "As políticas da sua organização estão afetando o tempo limite do seu cofre. O Tempo Limite Máximo permitido do Cofre é $HOURS$ hora(s) e $MINUTES$ minuto(s)",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1723,18 +1723,18 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "O tempo limite do seu cofre excede as restrições definidas por sua organização."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "Inscrição Automática"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "Esta organização possui uma política empresarial que irá inscrevê-lo automaticamente na redefinição de senha. A inscrição permitirá que os administradores da organização alterem sua senha mestra."
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "Exportação de Cofre Desabilitada"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "Uma ou mais políticas da organização impdem que você exporte seu cofre pessoal."
   }
 }
diff --git a/src/locales/ru/messages.json b/src/locales/ru/messages.json
index 5cbb3909..63b1abea 100644
--- a/src/locales/ru/messages.json
+++ b/src/locales/ru/messages.json
@@ -633,10 +633,10 @@
     "message": "Укажите URL-адрес Bitwarden на вашем сервере."
   },
   "customEnvironment": {
-    "message": "Настройка среды"
+    "message": "Пользовательское окружение"
   },
   "customEnvironmentFooter": {
-    "message": "Для продвинутых пользователей. Можно указать URL-адреса отдельно для каждой службы."
+    "message": "Для опытных пользователей. Можно указать URL отдельно для каждой службы."
   },
   "baseUrl": {
     "message": "URL-адрес сервера"
@@ -789,10 +789,10 @@
     "message": "Двухфакторная аутентификация"
   },
   "vaultTimeout": {
-    "message": "Таймаут хранилища"
+    "message": "Тайм-аут хранилища"
   },
   "vaultTimeoutDesc": {
-    "message": "Выберите таймаут для хранилища и действие, которое необходимо предпринять."
+    "message": "Выберите тайм-аут для хранилища и действие, которое необходимо предпринять."
   },
   "immediately": {
     "message": "Немедленно"
@@ -1363,7 +1363,7 @@
     "message": "На настройки генератора влияют одна или несколько политик организации."
   },
   "vaultTimeoutAction": {
-    "message": "Действие по таймауту хранилища"
+    "message": "Действие по тайм-ауту хранилища"
   },
   "vaultTimeoutActionLockDesc": {
     "message": "Заблокированное хранилище потребует повторного ввода мастер-пароля для получения доступа к нему."
@@ -1404,10 +1404,10 @@
     "message": "Удалить окончательно"
   },
   "vaultTimeoutLogOutConfirmation": {
-    "message": "По истечении таймаута будет выполнен выход, что приведет к отмене всех прав доступа к вашему хранилищу и потребует онлайн-аутентификации. Вы уверены, что хотите использовать этот параметр?"
+    "message": "По истечении тайм-аута будет выполнен выход, что приведет к отмене всех прав доступа к вашему хранилищу и потребует онлайн-аутентификации. Вы уверены, что хотите использовать этот параметр?"
   },
   "vaultTimeoutLogOutConfirmationTitle": {
-    "message": "Подтверждение действия по таймауту"
+    "message": "Подтверждение действия по тайм-ауту"
   },
   "enterpriseSingleSignOn": {
     "message": "Единая корпоративная авторизация (SSO)"
@@ -1634,7 +1634,7 @@
     "message": "1 день"
   },
   "custom": {
-    "message": "Другой"
+    "message": "Пользовательский"
   },
   "deleteSendConfirmation": {
     "message": "Вы действительно хотите удалить эту Send?",
@@ -1695,22 +1695,22 @@
     "message": "Это действие защищено. Для продолжения введите свой мастер-пароль, чтобы подтвердить свою личность."
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "Мастер-пароль обновлен"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "Обновить мастер-пароль"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "Мастер-пароль недавно был изменен администратором вашей организации. Чтобы получить доступ к хранилищу, вы должны обновить его сейчас. В результате текущая сессия будет завершена, потребуется повторный вход. Активные сессии на других устройствах могут оставаться активными в течение одного часа."
   },
   "hours": {
-    "message": "Hours"
+    "message": "Час."
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "Мин."
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "Политики вашей организации влияют на тайм-аут хранилища. Максимально допустимый тайм-аут хранилища составляет $HOURS$ час. и $MINUTES$ мин.",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1723,18 +1723,18 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "Тайм-аут вашего хранилища превышает ограничения, установленные вашей организацией."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "Автоматическая регистрация"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "В этой организации действует корпоративная политика, которая автоматически зарегистрирует вас на сброс пароля. Регистрация позволит администраторам организации изменить ваш мастер-пароль."
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "Экспорт хранилища отключен"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "Экспорт вашего личного хранилища запрещен одной или несколькими политиками организации."
   }
 }
diff --git a/src/locales/sk/messages.json b/src/locales/sk/messages.json
index beb44f6a..59ebf7d7 100644
--- a/src/locales/sk/messages.json
+++ b/src/locales/sk/messages.json
@@ -1695,22 +1695,22 @@
     "message": "Táto akcia je chránená. Ak chcete pokračovať, znova zadajte hlavné heslo a overte svoju totožnosť."
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "Hlavné heslo aktualizované"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "Aktualizovať hlavné heslo"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "Vaše hlavné heslo nedávno zmenil správca vo vašej organizácii. Ak chcete získať prístup k trezoru, musíte ho teraz aktualizovať. Pokračovaním sa odhlásite z aktuálnej relácie a budete sa musieť znova prihlásiť. Aktívne relácie na iných zariadeniach môžu zostať aktívne až jednu hodinu."
   },
   "hours": {
-    "message": "Hours"
+    "message": "Hodiny"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "Minúty"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "Zásady vašej organizácie ovplyvňujú časový limit trezoru. Maximálny povolený časový limit trezoru je $HOURS$ h a $MINUTES$ m",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1723,18 +1723,18 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "Časový limit vášho trezora prekračuje obmedzenia nastavené vašou organizáciou."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "Automatická registrácia"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "Táto organizácia má podnikovú politiku, ktorá vás automaticky zaregistruje na obnovenie hesla. Registrácia umožní správcom organizácie zmeniť vaše hlavné heslo."
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "Export trezoru je zakázaný"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "Jedna alebo viacero zásad organizácie vám bráni exportovať váš osobný trezor."
   }
 }
diff --git a/src/locales/sr/messages.json b/src/locales/sr/messages.json
index de87c0c1..39ffc933 100644
--- a/src/locales/sr/messages.json
+++ b/src/locales/sr/messages.json
@@ -45,7 +45,7 @@
     "message": "Подели"
   },
   "moveToOrganization": {
-    "message": "Прмести у организацију"
+    "message": "Премести у организацију"
   },
   "movedItemToOrg": {
     "message": "$ITEMNAME$ премештен у $ORGNAME$",
@@ -61,7 +61,7 @@
     }
   },
   "moveToOrgDesc": {
-    "message": "Изаберите организацију коју желите да преместите овај предмет. Прелазак на организацију преноси власништво над ставком у ту организацију. Више нећете бити директни власник ове ставке након што је премештена."
+    "message": "Изаберите организацију у коју желите да преместите овај предмет. Прелазак на организацију преноси власништво над ставком у ту организацију. Више нећете бити директни власник ове ставке након што је премештена."
   },
   "attachments": {
     "message": "Прилози"
@@ -95,7 +95,7 @@
     "message": "Лозинка"
   },
   "passphrase": {
-    "message": "Фраза лозинка"
+    "message": "Скривена фраза"
   },
   "editItem": {
     "message": "Уреди ставку"
@@ -123,16 +123,16 @@
     "description": "Copy value to clipboard"
   },
   "minimizeOnCopyToClipboard": {
-    "message": "Минимизирај приликом копирања у остави"
+    "message": "Минимизирај приликом копирања у привремену меморију"
   },
   "minimizeOnCopyToClipboardDesc": {
-    "message": "Минимизирај приликом копирања ставке у остави."
+    "message": "Минимизирај при копиранју података ставке у привремену меморију."
   },
   "toggleVisibility": {
-    "message": "Пребаци видљивост"
+    "message": "Промени видљивост"
   },
   "toggleCollapse": {
-    "message": "Пребаци проширење",
+    "message": "Промени проширење",
     "description": "Toggling an expand/collapse state."
   },
   "cardholderName": {
@@ -178,7 +178,7 @@
     "message": "Потребан Премијум"
   },
   "premiumRequiredDesc": {
-    "message": "Премијум је потребно за употребу ове способности."
+    "message": "Премиум чланарина је неопходна како бисте користили ову опцију."
   },
   "errorOccurred": {
     "message": "Појавила се грешка."
@@ -230,13 +230,13 @@
     "message": "Наслов"
   },
   "mr": {
-    "message": "Г."
+    "message": "Господин"
   },
   "mrs": {
-    "message": "Гђц."
+    "message": "Госпођица"
   },
   "ms": {
-    "message": "Гђа."
+    "message": "Госпођа"
   },
   "dr": {
     "message": "Др"
@@ -350,13 +350,13 @@
     "message": "Избриши прилог"
   },
   "deleteItemConfirmation": {
-    "message": "Сигурно избрисати ову ставку?"
+    "message": "Сигурно послати ставку у отпад?"
   },
   "deletedItem": {
     "message": "Ставка послата у Отпад"
   },
   "overwritePasswordConfirmation": {
-    "message": "Сигурно преписати тренутну лозинку?"
+    "message": "Сигурно променити тренутну лозинку?"
   },
   "noneFolder": {
     "message": "Без фасцикле",
@@ -413,7 +413,7 @@
     "message": "Претражи колекцију"
   },
   "searchFolder": {
-    "message": "Претражи фасцикли"
+    "message": "Претражи фасциклу"
   },
   "searchFavorites": {
     "message": "Претражи омиљене"
@@ -426,7 +426,7 @@
     "message": "Додај нови прилог"
   },
   "deletedAttachment": {
-    "message": "Избрисани прилози"
+    "message": "Прилог избрисан"
   },
   "deleteAttachmentConfirmation": {
     "message": "Сигурно обрисати овај прилог?"
@@ -444,7 +444,7 @@
     "message": "Максимална величина је 500МБ."
   },
   "updateKey": {
-    "message": "Не можете да користите ову способност док не промените Ваш кључ за шифровање."
+    "message": "Не можете да користите ову опцију док не промените Ваш кључ за шифровање."
   },
   "options": {
     "message": "Опције"
@@ -480,10 +480,10 @@
     "message": "Главна Лозинка је лозинка коју користите за приступ Вашем сефу. Врло је важно да је не заборавите. Не постоји начин да повратите лозинку у случају да је заборавите."
   },
   "masterPassHintDesc": {
-    "message": "Савет Главне Лозинке може да Вам помогне да се је потсетите ако је заборавите."
+    "message": "Савет Главне Лозинке може да Вам помогне да се подсетите ако је заборавите."
   },
   "reTypeMasterPass": {
-    "message": "Поновити Главну Лозинку"
+    "message": "Поновите Главну Лозинку"
   },
   "masterPassHint": {
     "message": "Савет Главне Лозинке (опционо)"
@@ -492,7 +492,7 @@
     "message": "Подешавања"
   },
   "passwordHint": {
-    "message": "Помоћ за лозинку"
+    "message": "Савет главне лозинке"
   },
   "enterEmailToGetHint": {
     "message": "Унесите Ваш имејл да би добили савет за Вашу Главну Лозинку."
@@ -516,7 +516,7 @@
     "message": "Потврђена Главна Лозинка се не подудара."
   },
   "newAccountCreated": {
-    "message": "Ваш налог је креиран! Сада се можте пријавити."
+    "message": "Ваш налог је креиран! Сада се можете пријавити."
   },
   "masterPassSent": {
     "message": "Послали смо Вам поруку са саветом главне лозинке."
@@ -528,7 +528,7 @@
     "message": "Инфо о ставци"
   },
   "noItemsInList": {
-    "message": "Нама ставке у листи."
+    "message": "Нема ставке која се може приказати."
   },
   "verificationCode": {
     "message": "Верификациони код"
@@ -592,7 +592,7 @@
     "message": "YubiKey OTP сигурносни кључ"
   },
   "yubiKeyDesc": {
-    "message": "Користите YubiKey за приступ налогу. Ради са YubiKey 4, 4 Nano, 4C, и NEO уређаје."
+    "message": "Користите YubiKey за приступ налогу. Ради са YubiKey 4, 4 Nano, 4C, и NEO уређајима."
   },
   "duoDesc": {
     "message": "Провери са Duo Security користећи Duo Mobile апликацију, СМС, телефонски позив, или U2F кључ.",
@@ -606,7 +606,7 @@
     "message": "FIDO2 WebAuthn"
   },
   "webAuthnDesc": {
-    "message": "Користите било који WebAuthn сигурносни кључ за присту налога."
+    "message": "Користите било који WebAuthn сигурносни кључ за присту налогу."
   },
   "emailTitle": {
     "message": "Имејл"
@@ -630,7 +630,7 @@
     "message": "Самостално окружење"
   },
   "selfHostedEnvironmentFooter": {
-    "message": "Наведите основни УРЛ вашег локалног инсталиране Bitwarden инсталације."
+    "message": "Наведите основни УРЛ ваше локалне Bitwarden инсталације."
   },
   "customEnvironment": {
     "message": "Прилагођено окружење"
@@ -651,7 +651,7 @@
     "message": "УРЛ сервера идентитета"
   },
   "notificationsUrl": {
-    "message": "УРЛ сервера нотификације"
+    "message": "УРЛ сервера обавештења"
   },
   "iconsUrl": {
     "message": "УРЛ сервера иконице"
@@ -669,7 +669,7 @@
     "message": "Не"
   },
   "overwritePassword": {
-    "message": "Препиши лозинку"
+    "message": "Промени лозинку"
   },
   "learnMore": {
     "message": "Сазнај више"
@@ -714,19 +714,19 @@
     "message": "Генератор Лозинке"
   },
   "emailUs": {
-    "message": "Послати нам поруку"
+    "message": "Пошалјите нам ЕМаил"
   },
   "visitOurWebsite": {
-    "message": "Посетити наш веб-сајт"
+    "message": "Посетите наш веб-сајт"
   },
   "fileBugReport": {
-    "message": "Поднети извештај о грешци"
+    "message": "Пријавите грешку"
   },
   "blog": {
     "message": "Блог"
   },
   "followUs": {
-    "message": "Пратити нас"
+    "message": "Пратите нас"
   },
   "syncVault": {
     "message": "Синхронизуј сеф"
@@ -761,7 +761,7 @@
     "message": "Синхронизација није успела"
   },
   "yourVaultIsLocked": {
-    "message": "Сеф је блокиран. Унесите главну лозинку за наставак."
+    "message": "Сеф је заклјучан. Унесите главну лозинку за наставак."
   },
   "unlock": {
     "message": "Откључај"
@@ -783,7 +783,7 @@
     "message": "Погрешна главна лозинка"
   },
   "twoStepLoginConfirmation": {
-    "message": "Пријава у два корака чини ваш рачун сигурнијим захтевом да верификујете своје податке помоћу другог уређаја, као што су безбедносни кључ, апликација, СМС-а, телефонски позив или имејл. Пријављивање у два корака може се омогућити на веб сефу. Да ли желите да посетите веб страницу сада?"
+    "message": "Пријава у два корака чини ваш налог сигурнијим захтевом да верификујете своје податке помоћу другог уређаја, као што су безбедносни кључ, апликација, СМС-а, телефонски позив или имејл. Пријављивање у два корака може се омогућити на веб сефу. Да ли желите да посетите веб страницу сада?"
   },
   "twoStepLogin": {
     "message": "Дво-коракна лозинка"
@@ -792,7 +792,7 @@
     "message": "Тајмаут сефа"
   },
   "vaultTimeoutDesc": {
-    "message": "Изаберите када ће сеф истећи и да изврши одабрану радњу."
+    "message": "Изаберите када ће сеф истећи и извршити одабрану радњу."
   },
   "immediately": {
     "message": "Одмах"
@@ -831,10 +831,10 @@
     "message": "На мировање система"
   },
   "onSleep": {
-    "message": "На успавање система"
+    "message": "Након спаванја система"
   },
   "onLocked": {
-    "message": "На блокирање система"
+    "message": "На закључавање система"
   },
   "onRestart": {
     "message": "На поновно покретање"
@@ -846,54 +846,54 @@
     "message": "Сигурност"
   },
   "clearClipboard": {
-    "message": "Обриши оставу",
+    "message": "Обриши привремену меморију",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
   "clearClipboardDesc": {
-    "message": "Аутоматски обришите копиране вредности из оставе.",
+    "message": "Аутоматски обришите копиране вредности из привремене меморије.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
   "disableFavicon": {
-    "message": "Угаси иконице сајта"
+    "message": "Онемогући иконице сајта"
   },
   "disableFaviconDesc": {
-    "message": "Иконе веб сајта пружају препознатљиву слику поред сваке пријаву у сефу."
+    "message": "Иконе веб сајта пружају препознатљиву слику поред сваке пријаве у сефу."
   },
   "enableMinToTray": {
-    "message": "Умањи у систем траку"
+    "message": "Минимизирај као иконицу у системској траци"
   },
   "enableMinToTrayDesc": {
-    "message": "Када минимизујете прозор, уместо тога покажите икону у системској палети."
+    "message": "Када минимизујете прозор, уместо тога покажите икону у системској траци."
   },
   "enableMinToMenuBar": {
     "message": "Смањи на траку менија"
   },
   "enableMinToMenuBarDesc": {
-    "message": "Када минимизујете прозор, покажи икону у мени траци."
+    "message": "Када минимизујете прозор, покажи икону у траци менија."
   },
   "enableCloseToTray": {
-    "message": "Затвори у системску иконицу"
+    "message": "Затваранје оставлја иконицу у системској траци"
   },
   "enableCloseToTrayDesc": {
-    "message": "Када затворите прозор, уместо тога покажите икону у системској палети."
+    "message": "Када затворите прозор, уместо тога покажите икону у системској траци."
   },
   "enableCloseToMenuBar": {
     "message": "Затвори у траку менија"
   },
   "enableCloseToMenuBarDesc": {
-    "message": "Када затворите прозор, покажите икону у траки менија."
+    "message": "Када затворите прозор, покажите икону у траци менија."
   },
   "enableTray": {
-    "message": "Омогући икону система"
+    "message": "Омогући иконицу у системској траци"
   },
   "enableTrayDesc": {
     "message": "Увек прикажи иконицу на системској траци."
   },
   "startToTray": {
-    "message": "Покрени као иконицу"
+    "message": "Покрени као иконицу у системској траци"
   },
   "startToTrayDesc": {
-    "message": "Када се апликација први пут покрене, прикажи је само као икону."
+    "message": "Када се апликација први пут покрене, прикажи је само као икону у системској траци."
   },
   "startToMenuBar": {
     "message": "Покрени у траци менија"
@@ -902,10 +902,10 @@
     "message": "Када се апликација први пут покрене, прикажи само икону у траци менија."
   },
   "openAtLogin": {
-    "message": "Ауто покрени на пријављивање"
+    "message": "Аутоматски покрени након пријављивања"
   },
   "openAtLoginDesc": {
-    "message": "Покрени Bitwarden Desktop апликацију на пријављивање."
+    "message": "Покрени Bitwarden Desktop апликацију аутоматски након пријављивања."
   },
   "alwaysShowDock": {
     "message": "Увек покажи у Dock"
@@ -914,10 +914,10 @@
     "message": "Покажи Bitwarden иконицу у Dock чак и када је умањен на траци менија."
   },
   "confirmTrayTitle": {
-    "message": "Потврди онемогућавање треја"
+    "message": "Потврди онемогућавање траке"
   },
   "confirmTrayDesc": {
-    "message": "Онемогућавање ове поставке онемогућиће се и сва остала подешавања у вези са трејом."
+    "message": "Ако онемогућите ово подешавање сва остала подешавања везана за системску траку ће такође бити онемогућена."
   },
   "language": {
     "message": "Језик"
@@ -944,7 +944,7 @@
     "description": "Copy to clipboard"
   },
   "checkForUpdates": {
-    "message": "Проверити верзију програма"
+    "message": "Провери доступна ажурирања"
   },
   "version": {
     "message": "Верзија $VERSION_NUM$",
@@ -971,7 +971,7 @@
     "message": "Ажурирање је доступно"
   },
   "updateAvailableDesc": {
-    "message": "Пронађено је ажурирање. Да ли желите да је преузмете сада?"
+    "message": "Пронађено је ажурирање. Да ли желите да га преузмете сада?"
   },
   "restart": {
     "message": "Поново покрени"
@@ -1006,7 +1006,7 @@
     "message": "Управљање чланством"
   },
   "premiumManageAlert": {
-    "message": "Можете менаџирати Вашу претплату на bitwarden.com. Да ли желите да посетите веб сајт сада?"
+    "message": "Можете управљати вашим чланством на bitwarden.com. Да ли желите да посетите веб сајт сада?"
   },
   "premiumRefresh": {
     "message": "Освежите чланство"
@@ -1067,7 +1067,7 @@
     "description": "To clear something out. example: To clear browser history."
   },
   "noPasswordsInList": {
-    "message": "Нама лозинке у листи."
+    "message": "Нема лозинки за приказивање."
   },
   "undo": {
     "message": "Опозови"
@@ -1080,7 +1080,7 @@
     "description": "Cut to clipboard"
   },
   "paste": {
-    "message": "Залепи",
+    "message": "Налепи",
     "description": "Paste from clipboard"
   },
   "selectAll": {
@@ -1190,7 +1190,7 @@
     "description": "Default URI match detection for auto-fill."
   },
   "toggleOptions": {
-    "message": "Пребацити опције"
+    "message": "Промена опција"
   },
   "organization": {
     "message": "Организација",
@@ -1207,7 +1207,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": "Сакриј у систему"
+    "message": "Сакриј у системску траку"
   },
   "alwaysOnTop": {
     "message": "Увек на врху",
@@ -1293,25 +1293,25 @@
     "message": "Погрешан ПИН код."
   },
   "yourVaultIsLockedPinCode": {
-    "message": "Сеф је блокиран. Проверити ПИН код за наставак."
+    "message": "Сеф је закључан. Потврдите ПИН код за наставак."
   },
   "unlockWithWindowsHello": {
     "message": "Откључај са Windows Hello"
   },
   "windowsHelloConsentMessage": {
-    "message": "Деблокира сеф."
+    "message": "Потврди за Bitwarden."
   },
   "unlockWithTouchId": {
     "message": "Откључај са Touch ID"
   },
   "touchIdConsentMessage": {
-    "message": "Деблокира сеф."
+    "message": "Откључај свој сеф"
   },
   "noAutoPromptWindowsHello": {
-    "message": "Не тражи Windows Hello на покретање."
+    "message": "Не тражи Windows Hello након покретања."
   },
   "noAutoPromptTouchId": {
-    "message": "Не тражи Touch ID на покретање."
+    "message": "Не тражи Touch ID након покретања."
   },
   "lockWithMasterPassOnRestart": {
     "message": "Закључајте са главном лозинком при поновном покретању"
@@ -1323,7 +1323,7 @@
     "message": "Омогући икону траке менија"
   },
   "enableMenuBarDesc": {
-    "message": "Увек покажи икону у траку менија."
+    "message": "Увек покажи икону у траци менија."
   },
   "hideToMenuBar": {
     "message": "Сакриј у траку менија"
@@ -1389,7 +1389,7 @@
     "message": "Да ли сте сигурни да желите да трајно избришете ову ставку?"
   },
   "permanentlyDeletedItem": {
-    "message": "Трајно избрисати ставку"
+    "message": "Трајно избрисана ставка"
   },
   "restoreItem": {
     "message": "Врати ставку"
@@ -1407,7 +1407,7 @@
     "message": "Одјава ће уклонити сваки приступ вашем сефу и захтева мрежну потврду идентитета након истека тајмаута. Да ли сте сигурни да желите да користите ову поставку?"
   },
   "vaultTimeoutLogOutConfirmationTitle": {
-    "message": "Потврда акције тајмаута"
+    "message": "Потврда акције истека времена"
   },
   "enterpriseSingleSignOn": {
     "message": "Enterprise Једна Пријава"
@@ -1425,7 +1425,7 @@
     "message": "Потрдити нову Главну Лозинку"
   },
   "masterPasswordPolicyInEffect": {
-    "message": "Једна или више смерница организације захтевају да ваша главна лозинка да би испуњавали следеће захтеве:"
+    "message": "Једна или више полиса организације захтевају да ваша главна лозинка испуни следеће захтеве:"
   },
   "policyInEffectMinComplexity": {
     "message": "Оцена минималне сложености од $SCORE$",
@@ -1446,16 +1446,16 @@
     }
   },
   "policyInEffectUppercase": {
-    "message": "Садржи један или више великих слова"
+    "message": "Садржи једно или више великих слова"
   },
   "policyInEffectLowercase": {
-    "message": "Садржи један или више малих слова"
+    "message": "Садржи једно или више малих слова"
   },
   "policyInEffectNumbers": {
-    "message": "Садрже један или више бројева"
+    "message": "Садржи један или више бројева"
   },
   "policyInEffectSpecial": {
-    "message": "Садрже један или више бројева ових специјалних слова $CHARS$",
+    "message": "Садржи један или више ових специјалних знакова $CHARS$",
     "placeholders": {
       "chars": {
         "content": "$1",
@@ -1464,13 +1464,13 @@
     }
   },
   "masterPasswordPolicyRequirementsNotMet": {
-    "message": "Ваша нова главна лозинка не испуњава захтеве смерница."
+    "message": "Ваша нова главна лозинка не испуњава захтеве полисе."
   },
   "acceptPolicies": {
     "message": "Означавањем овог поља пристајете на следеће:"
   },
   "acceptPoliciesError": {
-    "message": "Услови услуге и Политика приватности нису признати."
+    "message": "Услови услуге и Политика приватности нису прихваћени."
   },
   "enableBrowserIntegration": {
     "message": "Укључи интеграцију са претраживачем"
@@ -1515,10 +1515,10 @@
     "message": "Због смерница за предузећа, ограничено вам је чување предмета у вашем личном трезору. Промените опцију власништва у организацију и изаберите из доступних колекција."
   },
   "hintEqualsPassword": {
-    "message": "Ваша помоћ за лозинку не може да буде иста као лозинка."
+    "message": "Ваш савет за лозинку не може да буде исти као лозинка."
   },
   "personalOwnershipPolicyInEffect": {
-    "message": "Политика организације утичу на ваше могућности власништва."
+    "message": "Политика организације утиче на ваше могућности власништва."
   },
   "allSends": {
     "message": "Сва слања",
@@ -1589,7 +1589,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "textHiddenByDefault": {
-    "message": "На притуп „Send“-а, сакриј текст по дефаулту",
+    "message": "Када се приступа слању, подразумевано сакриј текст",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createdSend": {
@@ -1641,11 +1641,11 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "copySendLinkToClipboard": {
-    "message": "Копирај везу слања у бележницу",
+    "message": "Копирај везу слања у привремену меморију",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "copySendLinkOnSave": {
-    "message": "Копирај везу да би поделио слање на бележницу након снимања."
+    "message": "Копирај линк за дељење слања у привремену меморију након чувања."
   },
   "sendDisabled": {
     "message": "Слање онемогућено",
@@ -1695,22 +1695,22 @@
     "message": "Ова акција је заштићена. Да бисте наставили, поново унесите своју главну лозинку да бисте проверили идентитет."
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "Главна лозинка ажурирана"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "Ажурирај главну лозинку"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "Ваша главна лозинка је недавно промењена од стране администратора организације. Како  бисте приступили сефу, морате да је ажурирате. Ако наставите бићете одјављени из ваше тренутне сесије, што ће захтевати да се поново пријавите. Активне сесије на другим уређајима ће можда наставити да раде до сат времена."
   },
   "hours": {
-    "message": "Hours"
+    "message": "Сата"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "Минута"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "Полиса ваше организације утиче на време истека сефа. Максимално дозвољено време истека је $HOURS$ сат(и) и $MINUTES$ minut(а)",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1723,18 +1723,18 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "Време истека вашег сефа је премашило дозвољена ограничења од стране ваше организације."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "Аутоматска пријава"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "Ова организација има полису која ће вас аутоматски пријавити за ресетовање лозинке. Пријава ће дозволити администраторима ваше организације да промене главну лозинку."
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "Извоз сефа онемогућен"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "Једна или више полиса ваше организације вас спречава да извезете ваш сеф."
   }
 }
diff --git a/src/locales/sv/messages.json b/src/locales/sv/messages.json
index 0b51084c..a620bda0 100644
--- a/src/locales/sv/messages.json
+++ b/src/locales/sv/messages.json
@@ -1704,10 +1704,10 @@
     "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
   "hours": {
-    "message": "Hours"
+    "message": "Timmar"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "Minuter"
   },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
diff --git a/src/locales/th/messages.json b/src/locales/th/messages.json
index 3fe70976..c26c6b23 100644
--- a/src/locales/th/messages.json
+++ b/src/locales/th/messages.json
@@ -3,7 +3,7 @@
     "message": "bitwarden"
   },
   "filters": {
-    "message": "Filters"
+    "message": "ตัวกรอง"
   },
   "allItems": {
     "message": "รายการทั้งหมด"
diff --git a/src/locales/tr/messages.json b/src/locales/tr/messages.json
index d2011be5..8cc51e55 100644
--- a/src/locales/tr/messages.json
+++ b/src/locales/tr/messages.json
@@ -1695,19 +1695,19 @@
     "message": "Bu işleme devam etmek için lütfen ana parolanızı yeniden girin."
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "Ana parola güncellendi"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "Ana parolayı güncelle"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "Ana parolanız kuruluşunuzdaki bir yönetici tarafından yakın zamanda değiştirildi. Kasanıza erişmek için parolanızı güncellemelisiniz. Devam ettiğinizde oturumunuz kapanacak ve yeniden oturum açmanız gerekecektir. Diğer cihazlardaki aktif oturumlar bir saate kadar aktif kalabilir."
   },
   "hours": {
-    "message": "Hours"
+    "message": "Saat"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "Dakika"
   },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
@@ -1732,7 +1732,7 @@
     "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "Kasayı dışa aktarma devre dışı"
   },
   "personalVaultExportPolicyInEffect": {
     "message": "One or more organization policies prevents you from exporting your personal vault."
diff --git a/src/locales/uk/messages.json b/src/locales/uk/messages.json
index 75edc92f..59f48d1c 100644
--- a/src/locales/uk/messages.json
+++ b/src/locales/uk/messages.json
@@ -1695,22 +1695,22 @@
     "message": "Ця дія захищена. Щоб продовжити, повторно введіть головний пароль."
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "Головний пароль оновлено"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "Оновити головний пароль"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "Ваш головний пароль нещодавно був змінений адміністратором організації. Щоб отримати доступ до сховища, ви повинні оновити його зараз. Продовживши, ви вийдете з поточного сеансу, після чого необхідно буде повторно виконати вхід. Сеанси на інших пристроях можуть залишатися активними протягом однієї години."
   },
   "hours": {
-    "message": "Hours"
+    "message": "Годин"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "Хвилин"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "Політики вашої організації впливають на час очікування сховища. Максимальний дозволений час очікування сховища $HOURS$ годин, $MINUTES$ хвилин",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1723,18 +1723,18 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "Час очікування сховища перевищує обмеження, встановлені вашою організацією."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "Автоматичне розгортання"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "Ця організація має корпоративну політику, яка автоматично розгортає вас на скидання пароля. Розгортання дозволятиме адміністраторам організації змінювати ваш головний пароль."
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "Експорт сховища вимкнено"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "Одна чи декілька організаційних політик не дозволяють вам експортувати особисте сховище."
   }
 }
diff --git a/src/locales/zh_TW/messages.json b/src/locales/zh_TW/messages.json
index 00152abe..1f33a0d1 100644
--- a/src/locales/zh_TW/messages.json
+++ b/src/locales/zh_TW/messages.json
@@ -1695,22 +1695,22 @@
     "message": "此操作受到保護。若要繼續，請重新輸入您的主密碼以驗證您的身份。"
   },
   "updatedMasterPassword": {
-    "message": "Updated Master Password"
+    "message": "已更新主密碼"
   },
   "updateMasterPassword": {
-    "message": "Update Master Password"
+    "message": "更新主密碼"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your Master Password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "您的主密碼最近被您的組織管理者更改過。要存取密碼庫，您必須現在更新主密碼。繼續操作會登出目前的登入階段，要求您重新登入。其他裝置上使用中的登入階段可能持續最長一個小時。"
   },
   "hours": {
-    "message": "Hours"
+    "message": "小時"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "分鐘"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "您的組織策略正在影響您的密碼庫逾時時長。密碼庫逾時時長最多可以設定到 $HOURS$ 小時，$MINUTES$ 分鐘。",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1723,18 +1723,18 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "您的密碼庫逾時時長超過組織限制。"
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "自動註冊"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
+    "message": "此組織擁有一個可以爲你自動注冊密碼重置的企業策略。注冊后將允許組織管理員變更您的主密碼。"
   },
   "vaultExportDisabled": {
-    "message": "Vault Export Disabled"
+    "message": "密碼庫匯出已停用"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "One or more organization policies prevents you from exporting your personal vault."
+    "message": "一或多個組織策略不允許您輸出個人密碼庫。"
   }
 }
diff --git a/src/main/menu.main.ts b/src/main/menu.main.ts
index 0c729da7..769570c6 100644
--- a/src/main/menu.main.ts
+++ b/src/main/menu.main.ts
@@ -71,11 +71,14 @@ export class MenuMain extends BaseMenu {
             this.syncVault, this.exportVault, this.settings, this.twoStepLogin, this.fingerprintPhrase,
             this.changeMasterPass, this.premiumMembership, this.passwordGenerator, this.passwordHistory,
             this.searchVault, this.copyUsername, this.copyPassword];
-        this.updateApplicationMenuState();
+        this.updateApplicationMenuState(true);
     }
 
-    updateApplicationMenuState(accounts?: { [userId: string]: { isAuthenticated: boolean, isLocked: boolean, userId: string, email: string }}, activeUserId?: string) {
+    updateApplicationMenuState(enableChangeMasterPass: boolean, accounts?: { [userId: string]: { isAuthenticated: boolean, isLocked: boolean, userId: string, email: string }}, activeUserId?: string) {
         this.updateAuthBasedMenuState(accounts, activeUserId);
+        if (enableChangeMasterPass != null && this.changeMasterPass != null) {
+            this.changeMasterPass.enabled = enableChangeMasterPass;
+        }
         if (this.menu != null) {
             Menu.setApplicationMenu(this.menu);
         }
diff --git a/src/main/messaging.main.ts b/src/main/messaging.main.ts
index ff12752d..7d0d5171 100644
--- a/src/main/messaging.main.ts
+++ b/src/main/messaging.main.ts
@@ -30,7 +30,7 @@ export class MessagingMain {
                 this.scheduleNextSync();
                 break;
             case 'updateAppMenu':
-                this.main.menuMain.updateApplicationMenuState(message.accounts, message.activeUserId);
+                this.main.menuMain.updateApplicationMenuState(message.enableChangeMasterPass, message.accounts, message.activeUserId);
                 this.updateTrayMenu(message.accounts ? message.accounts[message.activeUserId] : null);
                 break;
             case 'minimizeOnCopy':
diff --git a/src/package.json b/src/package.json
index 15c9500b..434b4316 100644
--- a/src/package.json
+++ b/src/package.json
@@ -2,7 +2,7 @@
   "name": "bitwarden",
   "productName": "Bitwarden",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "1.28.3",
+  "version": "1.29.2",
   "author": "Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)",
   "homepage": "https://bitwarden.com",
   "license": "GPL-3.0",
diff --git a/src/scss/box.scss b/src/scss/box.scss
index 3e5dedb6..c8b9ff0f 100644
--- a/src/scss/box.scss
+++ b/src/scss/box.scss
@@ -409,4 +409,21 @@
             background-color: $brand-primary;
         }
     }
+
+    .icon {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        min-width: 34px;
+        height: 100%;
+        margin-left: -5px;
+
+        @include themify($themes) {
+            color: themed('mutedColor');
+        }
+
+        &.icon-small {
+            min-width: 25px;
+        }
+    }
 }
diff --git a/src/scss/pages.scss b/src/scss/pages.scss
index 1630ee32..a6fbe2ca 100644
--- a/src/scss/pages.scss
+++ b/src/scss/pages.scss
@@ -1,6 +1,6 @@
 @import "variables.scss";
 
-#login-page, #lock-page, #sso-page, #set-password-page {
+#login-page, #lock-page, #sso-page, #set-password-page, #remove-password-page {
     display: flex;
     justify-content: center;
     align-items: center;
@@ -23,7 +23,7 @@
     }
 }
 
-#register-page, #hint-page, #two-factor-page, #update-temp-password-page {
+#register-page, #hint-page, #two-factor-page, #update-temp-password-page, #remove-password-page {
     padding-top: 20px;
 
     .content {
@@ -157,7 +157,7 @@
     }
 }
 
-#set-password-page {
+#set-password-page, #remove-password-page {
     .content {
         width: 500px;
 
@@ -210,3 +210,9 @@
         width: 400px;
     }
 }
+
+#remove-password-page {
+    .content > p {
+        margin-bottom: 20px;
+    }
+}