Merge branch 'master' into feature/org-admin-refresh

2025-12-15 15:53:27 +00:00 · 2022-08-29 10:48:20 -05:00
parent 4e54d9f270 a108476c3c
commit d116ff83c7
279 changed files with 4467 additions and 2169 deletions
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,5 +1,6 @@
 **/build
 **/dist
+**/coverage
 .angular

 **/node_modules
@@ -21,3 +22,7 @@ apps/web/src/theme.js
 apps/web/tailwind.config.js

 apps/cli/config/config.js
+
+tailwind.config.js
+libs/components/tailwind.config.base.js
+libs/components/tailwind.config.js
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -4,13 +4,19 @@
    "browser": true,
    "webextensions": true
  },
-  "plugins": ["@typescript-eslint"],
+  "plugins": ["@typescript-eslint", "rxjs", "rxjs-angular"],
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "project": ["./tsconfig.eslint.json"],
+    "sourceType": "module"
+  },
  "extends": [
    "eslint:recommended",
    "plugin:@typescript-eslint/recommended",
    "plugin:import/recommended",
    "plugin:import/typescript",
-    "prettier"
+    "prettier",
+    "plugin:rxjs/recommended"
  ],
  "rules": {
    "@typescript-eslint/no-explicit-any": "off", // TODO: This should be re-enabled
@@ -50,6 +56,7 @@
        ],
        "pathGroupsExcludedImportTypes": ["builtin"]
      }
-    ]
+    ],
+    "rxjs-angular/prefer-takeuntil": "error"
  }
 }
--- a/.github/workflows/build-browser.yml
+++ b/.github/workflows/build-browser.yml
@@ -138,10 +138,13 @@ jobs:
        run: npm ci
        working-directory: ./

-      - name: Build & Test
+      - name: Build
        run: |
          npm run dist
-          npm run test
+
+      - name: Build Manifest v3
+        run: |
+          npm run dist:chrome:mv3

      - name: Gulp
        run: gulp ci
@@ -181,6 +184,13 @@ jobs:
          path: apps/browser/dist/dist-chrome.zip
          if-no-files-found: error

+      - name: Upload Chrome MV3 artifact
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535  # v3.0.0
+        with:
+          name: dist-chrome-MV3-${{ env._BUILD_NUMBER }}.zip
+          path: apps/browser/dist/dist-chrome-MV3.zip
+          if-no-files-found: error
+
      - name: Upload Firefox artifact
        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535  # v3.0.0
        with:
--- a/.github/workflows/build-cli.yml
+++ b/.github/workflows/build-cli.yml
@@ -155,9 +155,6 @@ jobs:
        run: npm ci
        working-directory: ./

-      - name: Run tests
-        run: npm run test
-
      - name: Build & Package
        run: npm run dist --quiet

--- a/.github/workflows/release-desktop-beta.yml
+++ b/.github/workflows/release-desktop-beta.yml
@@ -652,7 +652,7 @@ jobs:
        run: npm run build

      - name: Download artifact from hotfix-rc
-        if: github.ref == 'refs/heads/hotfix-rc')
+        if: github.ref == 'refs/heads/hotfix-rc'
        uses: dawidd6/action-download-artifact@b2abf1705491048a2d7074f7d90513044fd25d39  # v2.19.0
        with:
          workflow: build-browser.yml
@@ -854,7 +854,7 @@ jobs:
        run: npm run build

      - name: Download artifact from hotfix-rc
-        if: github.ref == 'refs/heads/hotfix-rc')
+        if: github.ref == 'refs/heads/hotfix-rc'
        uses: dawidd6/action-download-artifact@b2abf1705491048a2d7074f7d90513044fd25d39  # v2.19.0
        with:
          workflow: build-browser.yml
--- a/.github/workflows/release-qa-web.yml
+++ b/.github/workflows/release-qa-web.yml
@@ -81,7 +81,7 @@ jobs:
          environment-url: http://vault.qa.bitwarden.pw
          environment: 'Web Vault - QA'
          description: 'Deployment from branch ${{ github.ref_name }}'
-      
+
      - name: Update deployment status to In Progress
        uses: chrnorm/deployment-status@07b3930847f65e71c9c6802ff5a402f6dfb46b86
        with:
@@ -94,7 +94,7 @@ jobs:
        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b  # v3.0.2

      - name: Download latest cloud asset
-        uses: bitwarden/gh-actions/download-artifacts@c1fa8e09871a860862d6bbe36184b06d2c7e35a8
+        uses: bitwarden/gh-actions/download-artifacts@850faad0cf6c02a8c0dc46eddde2363fbd6c373a
        with:
          workflow: build-web.yml
          path: apps/web
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -0,0 +1,48 @@
+---
+name: Run tests
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches-ignore:
+      - 'l10n_master'
+      - 'cf-pages'
+    paths:
+      - 'apps/**'
+      - 'libs/**'
+      - '*'
+      - '!*.md'
+      - '!*.txt'
+      - '.github/workflows/test.yml'
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  test:
+    name: Run tests
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
+
+      - name: Set up Node
+        uses: actions/setup-node@9ced9a43a244f3ac94f13bfd896db8c8f30da67a  # v3.0.0
+        with:
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
+          node-version: '16'
+
+      - name: Print environment
+        run: |
+          node --version
+          npm --version
+
+      - name: Install Node dependencies
+        run: npm ci
+
+      - name: Run tests
+        run: |
+          export NODE_OPTIONS=--max_old_space_size=6144
+          npm run test
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,4 @@ coverage

 # Storybook
 documentation.json
+.eslintcache
--- a/.prettierignore
+++ b/.prettierignore
@@ -3,6 +3,7 @@
 **/dist
 **/coverage
 .angular
+documentation.json

 # External libraries / auto synced locales
 apps/browser/src/_locales
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "cSpell.words": ["Popout", "Reprompt", "takeuntil"]
+}
--- a/README.md
+++ b/README.md
@@ -5,9 +5,15 @@
  <a href="https://github.com/bitwarden/clients/actions/workflows/build-browser.yml?query=branch:master" target="_blank">
    <img src="https://github.com/bitwarden/clients/actions/workflows/build-browser.yml/badge.svg?branch=master" alt="Github Workflow browser build on master" />
  </a>
+  <a href="https://github.com/bitwarden/clients/actions/workflows/build-cli.yml?query=branch:master" target="_blank">
+    <img src="https://github.com/bitwarden/clients/actions/workflows/build-cli.yml/badge.svg?branch=master" alt="Github Workflow CLI build on master" />
+  </a>
  <a href="https://github.com/bitwarden/clients/actions/workflows/build-desktop.yml?query=branch:master" target="_blank">
    <img src="https://github.com/bitwarden/clients/actions/workflows/build-desktop.yml/badge.svg?branch=master" alt="Github Workflow desktop build on master" />
  </a>
+    <a href="https://github.com/bitwarden/clients/actions/workflows/build-web.yml?query=branch:master" target="_blank">
+    <img src="https://github.com/bitwarden/clients/actions/workflows/build-web.yml/badge.svg?branch=master" alt="Github Workflow web build on master" />
+  </a>  
  <a href="https://gitter.im/bitwarden/Lobby" target="_blank">
    <img src="https://badges.gitter.im/bitwarden/Lobby.svg" alt="gitter chat" />
  </a>
--- a/apps/browser/gulpfile.js
+++ b/apps/browser/gulpfile.js
@@ -34,6 +34,9 @@ const filters = {

 function buildString() {
  var build = "";
+  if (process.env.MANIFEST_VERSION) {
+    build = `-mv${process.env.MANIFEST_VERSION}`;
+  }
  if (process.env.BUILD_NUMBER && process.env.BUILD_NUMBER !== "") {
    build = `-${process.env.BUILD_NUMBER}`;
  }
@@ -57,6 +60,7 @@ function dist(browserName, manifest) {
 function distFirefox() {
  return dist("firefox", (manifest) => {
    delete manifest.content_security_policy;
+    delete manifest.storage;
    removeShortcuts(manifest);
    return manifest;
  });
--- a/apps/browser/package.json
+++ b/apps/browser/package.json
@@ -10,7 +10,7 @@
    "build:prod:watch": "cross-env NODE_ENV=production webpack --watch",
    "dist": "npm run build:prod && gulp dist",
    "dist:chrome": "npm run build:prod && gulp dist:chrome",
-    "dist:chrome:mv3": "cross-env MANIFEST_VERSION=3 npm run build:prod && gulp dist:chrome",
+    "dist:chrome:mv3": "cross-env MANIFEST_VERSION=3 npm run build:prod && cross-env MANIFEST_VERSION=3 gulp dist:chrome",
    "dist:firefox": "npm run build:prod && gulp dist:firefox",
    "dist:opera": "npm run build:prod && gulp dist:opera",
    "dist:safari": "npm run build:prod && gulp dist:safari",
--- a/apps/browser/src/_locales/cs/messages.json
+++ b/apps/browser/src/_locales/cs/messages.json
@@ -53,13 +53,13 @@
    "message": "Karta"
  },
  "vault": {
-    "message": "Vault"
+    "message": "Trezor"
  },
  "myVault": {
    "message": "Můj trezor"
  },
  "allVaults": {
-    "message": "All Vaults"
+    "message": "Všechny trezory"
  },
  "tools": {
    "message": "Nástroje"
@@ -424,13 +424,13 @@
    "message": "Neplatná e-mailová adresa."
  },
  "masterPasswordRequired": {
-    "message": "Master password is required."
+    "message": "Je vyžadováno hlavní heslo."
  },
  "confirmMasterPasswordRequired": {
-    "message": "Master password retype is required."
+    "message": "Je vyžadováno zopakovat zadání hlavního hesla."
  },
  "masterPasswordMinlength": {
-    "message": "Master password must be at least 8 characters long."
+    "message": "Hlavní heslo musí obsahovat alespoň 8 znaků."
  },
  "masterPassDoesntMatch": {
    "message": "Potvrzení hlavního hesla se neshoduje."
@@ -603,7 +603,7 @@
    "message": "Ano, uložit nyní"
  },
  "enableChangedPasswordNotification": {
-    "message": "Ask to update existing login"
+    "message": "Zeptat se na aktualizaci existujícího přihlášení"
  },
  "changedPasswordNotificationDesc": {
    "message": "Ask to update a login's password when a change is detected on a website."
@@ -810,13 +810,13 @@
    "message": "Obnova je dokončena"
  },
  "enableAutoTotpCopy": {
-    "message": "Copy TOTP automatically"
+    "message": "Automaticky kopírovat TOTP"
  },
  "disableAutoTotpCopyDesc": {
    "message": "Pokud mají vaše přihlašovací údaje přidán autentizační klíč pro TOTP, vygenerovaný ověřovací kód (TOTP) se automaticky zkopíruje do schránky při každém automatickém vyplnění přihlašovacích údajů."
  },
  "enableAutoBiometricsPrompt": {
-    "message": "Ask for biometrics on launch"
+    "message": "Ověřit biometrické údaje při spuštění"
  },
  "premiumRequired": {
    "message": "Vyžaduje prémiové členství"
@@ -1037,16 +1037,16 @@
    "message": "Tento prohlížeč nemůže zpracovat U2F požadavky ve vyskakovacím okně. Chcete otevřít toto vyskakovací okno v novém okně, abyste se mohli přihlásit pomocí U2F?"
  },
  "enableFavicon": {
-    "message": "Show website icons"
+    "message": "Zobrazit ikony webových stránek"
  },
  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+    "message": "Zobrazit rozeznatelný obrázek vedle každého přihlášení."
  },
  "enableBadgeCounter": {
    "message": "Show badge counter"
  },
  "badgeCounterDesc": {
-    "message": "Indicate how many logins you have for the current web page."
+    "message": "Zobrazit počet přihlašovacích údajů pro aktuální webovou stránku."
  },
  "cardholderName": {
    "message": "Jméno držitele karty"
@@ -1907,7 +1907,7 @@
    }
  },
  "error": {
-    "message": "Error"
+    "message": "Chyba"
  },
  "regenerateUsername": {
    "message": "Znovu vygenerovat uživatelské jméno"
@@ -1969,7 +1969,7 @@
    "message": "Key Connector error: make sure Key Connector is available and working correctly."
  },
  "premiumSubcriptionRequired": {
-    "message": "Premium subscription required"
+    "message": "Vyžadováno prémiové předplatné"
  },
  "organizationIsDisabled": {
    "message": "Organization is disabled."
@@ -1990,10 +1990,10 @@
    }
  },
  "settingsEdited": {
-    "message": "Settings have been edited"
+    "message": "Nastavení byla upravena"
  },
  "environmentEditedClick": {
-    "message": "Click here"
+    "message": "Klikněte zde"
  },
  "environmentEditedReset": {
    "message": "to reset to pre-configured settings"
--- a/apps/browser/src/_locales/da/messages.json
+++ b/apps/browser/src/_locales/da/messages.json
@@ -1969,7 +1969,7 @@
    "message": "Key Connector-fejl: Sørg for, at Key Connector er tilgængelig og fungerer korrekt."
  },
  "premiumSubcriptionRequired": {
-    "message": "Premium subscription required"
+    "message": "Premium-abonnement kræves"
  },
  "organizationIsDisabled": {
    "message": "Organisationen er deaktiveret."
@@ -1981,7 +1981,7 @@
    "message": "Mir"
  },
  "loggingInTo": {
-    "message": "Logging in to $DOMAIN$",
+    "message": "Logger ind på $DOMAIN$",
    "placeholders": {
      "domain": {
        "content": "$1",
@@ -1990,12 +1990,12 @@
    }
  },
  "settingsEdited": {
-    "message": "Settings have been edited"
+    "message": "Indstillinger er blevet redigeret"
  },
  "environmentEditedClick": {
-    "message": "Click here"
+    "message": "Klik her"
  },
  "environmentEditedReset": {
-    "message": "to reset to pre-configured settings"
+    "message": "for at nulstille til forudkonfigurerede indstillinger"
  }
 }
--- a/apps/browser/src/_locales/de/messages.json
+++ b/apps/browser/src/_locales/de/messages.json
@@ -1565,7 +1565,7 @@
    "message": "Eine Organisationsrichtlinie beeinflusst deine Eigentümer-Optionen."
  },
  "excludedDomains": {
-    "message": "Ausgeschlossene Domänen"
+    "message": "Ausgeschlossene Domains"
  },
  "excludedDomainsDesc": {
    "message": "Bitwarden wird keine Login-Daten für diese Domäne speichern. Du musst die Seite aktualisieren, damit die Änderungen wirksam werden."
--- a/apps/browser/src/_locales/el/messages.json
+++ b/apps/browser/src/_locales/el/messages.json
@@ -424,13 +424,13 @@
    "message": "Μη έγκυρη διεύθυνση e-mail."
  },
  "masterPasswordRequired": {
-    "message": "Master password is required."
+    "message": "Απαιτείται κύριος κωδικός πρόσβασης."
  },
  "confirmMasterPasswordRequired": {
-    "message": "Master password retype is required."
+    "message": "Απαιτείται ξανά ο κύριος κωδικός πρόσβασης."
  },
  "masterPasswordMinlength": {
-    "message": "Master password must be at least 8 characters long."
+    "message": "Ο κύριος κωδικός πρέπει να έχει μήκος τουλάχιστον 8 χαρακτήρες."
  },
  "masterPassDoesntMatch": {
    "message": "Η επιβεβαίωση κύριου κωδικού δεν ταιριάζει."
@@ -571,22 +571,22 @@
    "description": "This is the folder for uncategorized items"
  },
  "enableAddLoginNotification": {
-    "message": "Ask to add login"
+    "message": "Ζητήστε να προσθέσετε σύνδεση"
  },
  "addLoginNotificationDesc": {
    "message": "Η \"Προσθήκη Ειδοποίησης Σύνδεσης\" σας προτρέπει αυτόματα να αποθηκεύσετε νέες συνδέσεις στο vault σας κάθε φορά που θα συνδεθείτε για πρώτη φορά."
  },
  "showCardsCurrentTab": {
-    "message": "Show cards on Tab page"
+    "message": "Εμφάνιση καρτών στη σελίδα Καρτέλας"
  },
  "showCardsCurrentTabDesc": {
-    "message": "List card items on the Tab page for easy auto-fill."
+    "message": "Λίστα αντικειμένων καρτών στη σελίδα Καρτέλας για εύκολη αυτόματη συμπλήρωση."
  },
  "showIdentitiesCurrentTab": {
-    "message": "Show identities on Tab page"
+    "message": "Εμφάνιση ταυτοτήτων στη σελίδα καρτέλας"
  },
  "showIdentitiesCurrentTabDesc": {
-    "message": "List identity items on the Tab page for easy auto-fill."
+    "message": "Λίστα στοιχείων ταυτότητας στη σελίδα Καρτέλας για εύκολη αυτόματη συμπλήρωση."
  },
  "clearClipboard": {
    "message": "Εκκαθάριση Πρόχειρου",
@@ -603,10 +603,10 @@
    "message": "Ναι, Αποθήκευση Τώρα"
  },
  "enableChangedPasswordNotification": {
-    "message": "Ask to update existing login"
+    "message": "Ζητήστε να ενημερώσετε την υπάρχουσα σύνδεση"
  },
  "changedPasswordNotificationDesc": {
-    "message": "Ask to update a login's password when a change is detected on a website."
+    "message": "Ζητήστε να ενημερώσετε τον κωδικό πρόσβασης μιας σύνδεσης όταν εντοπιστεί μια αλλαγή σε μια ιστοσελίδα."
  },
  "notificationChangeDesc": {
    "message": "Θέλετε να ενημερώσετε αυτό τον κωδικό στο Bitwarden ;"
@@ -615,10 +615,10 @@
    "message": "Ναι, Ενημέρωση Τώρα"
  },
  "enableContextMenuItem": {
-    "message": "Show context menu options"
+    "message": "Εμφάνιση επιλογών μενού περιβάλλοντος"
  },
  "contextMenuItemDesc": {
-    "message": "Use a secondary click to access password generation and matching logins for the website. "
+    "message": "Χρησιμοποιήστε ένα δευτερεύον κλικ για να αποκτήσετε πρόσβαση στη δημιουργία κωδικού πρόσβασης και να ταιριάξετε τις συνδέσεις για την ιστοσελίδα. "
  },
  "defaultUriMatchDetection": {
    "message": "Προεπιλεγμένη ανίχνευση αντιστοιχίας URI",
@@ -810,13 +810,13 @@
    "message": "Επιτυχής ανανέωση"
  },
  "enableAutoTotpCopy": {
-    "message": "Copy TOTP automatically"
+    "message": "Αυτόματη αντιγραφή TOTP"
  },
  "disableAutoTotpCopyDesc": {
    "message": "Εάν η σύνδεση έχει συνημμένο κάποιο κλειδί επαλήθευσης, ο κωδικός επαλήθευσης TOTP αντιγράφεται αυτόματα στο πρόχειρο κάθε φορά που συμπληρώνετε αυτόματα τα στοιχεία σύνδεσης."
  },
  "enableAutoBiometricsPrompt": {
-    "message": "Ask for biometrics on launch"
+    "message": "Ζητήστε βιομετρικά κατά την εκκίνηση"
  },
  "premiumRequired": {
    "message": "Απαιτείται Έκδοση Premium"
@@ -966,7 +966,7 @@
    "message": "Προεπιλεγμένη ρύθμιση αυτόματης συμπλήρωσης για στοιχεία σύνδεσης"
  },
  "defaultAutoFillOnPageLoadDesc": {
-    "message": "Αφού ενεργοποιήσετε την αυτόματη συμπλήρωση κατά τη Φόρτωση Σελίδας, μπορείτε να ενεργοποιήσετε ή να απενεργοποιήσετε τη λειτουργία για μεμονωμένα στοιχεία σύνδεσης. Αυτή είναι η προεπιλεγμένη ρύθμιση για στοιχεία σύνδεσης που δεν έχουν ρυθμιστεί ξεχωριστά."
+    "message": "Μπορείτε να απενεργοποιήσετε την αυτόματη συμπλήρωση φόρτωσης σελίδας για μεμονωμένα στοιχεία σύνδεσης από την προβολή Επεξεργασία στοιχείου."
  },
  "itemAutoFillOnPageLoad": {
    "message": "Αυτόματη συμπλήρωση της Φόρτισης Σελίδας (αν είναι ενεργοποιημένη στις Επιλογές)"
@@ -1037,16 +1037,16 @@
    "message": "Αυτό το πρόγραμμα περιήγησης δεν μπορεί να επεξεργαστεί αιτήματα του U2F σε αυτό το αναδυόμενο παράθυρο. Θέλετε να ανοίξετε το αναδυόμενο σε νέο παράθυρο, ώστε να μπορείτε να συνδεθείτε χρησιμοποιώντας U2F;"
  },
  "enableFavicon": {
-    "message": "Show website icons"
+    "message": "Εμφάνιση εικονιδίων ιστοσελίδας"
  },
  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+    "message": "Εμφάνιση μιας αναγνωρίσιμης εικόνας δίπλα σε κάθε σύνδεση."
  },
  "enableBadgeCounter": {
-    "message": "Show badge counter"
+    "message": "Εμφάνιση μετρητή εμβλημάτων"
  },
  "badgeCounterDesc": {
-    "message": "Indicate how many logins you have for the current web page."
+    "message": "Υποδείξτε πόσες συνδέσεις έχετε για την τρέχουσα ιστοσελίδα."
  },
  "cardholderName": {
    "message": "Όνομα κατόχου της κάρτας"
@@ -1484,7 +1484,7 @@
    "message": "Επιλέγοντας αυτό το πλαίσιο, συμφωνείτε με τα εξής:"
  },
  "acceptPoliciesRequired": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "Οι Όροι Παροχής Υπηρεσιών και η Πολιτική Απορρήτου δεν έχουν αναγνωριστεί."
  },
  "termsOfService": {
    "message": "Όροι Χρήσης"
@@ -1850,7 +1850,7 @@
    }
  },
  "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "Το χρονικό όριο του vault σας υπερβαίνει τους περιορισμούς που έχει ορίσει ο οργανισμός σας."
  },
  "vaultExportDisabled": {
    "message": "Εξαγωγή vault Απενεργοποιημένη"
@@ -1969,19 +1969,19 @@
    "message": "Σφάλμα Key Connector: βεβαιωθείτε ότι το Key Connector είναι διαθέσιμο και λειτουργεί σωστά."
  },
  "premiumSubcriptionRequired": {
-    "message": "Premium subscription required"
+    "message": "Απαιτείται συνδρομή Premium"
  },
  "organizationIsDisabled": {
-    "message": "Organization is disabled."
+    "message": "Ο οργανισμός είναι απενεργοποιημένος."
  },
  "disabledOrganizationFilterError": {
-    "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+    "message": "Δεν είναι δυνατή η πρόσβαση σε αντικείμενα σε απενεργοποιημένους οργανισμούς. Επικοινωνήστε με τον ιδιοκτήτη του Οργανισμού για βοήθεια."
  },
  "cardBrandMir": {
    "message": "Mir"
  },
  "loggingInTo": {
-    "message": "Logging in to $DOMAIN$",
+    "message": "Σύνδεση στο $DOMAIN$",
    "placeholders": {
      "domain": {
        "content": "$1",
@@ -1990,12 +1990,12 @@
    }
  },
  "settingsEdited": {
-    "message": "Settings have been edited"
+    "message": "Οι ρυθμίσεις έχουν επεξεργαστεί"
  },
  "environmentEditedClick": {
-    "message": "Click here"
+    "message": "Κάντε κλικ εδώ"
  },
  "environmentEditedReset": {
-    "message": "to reset to pre-configured settings"
+    "message": "επαναφορά στις προ-ρυθμισμένες ρυθμίσεις"
  }
 }
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -1967,7 +1967,7 @@
  },
  "ssoKeyConnectorError": {
    "message": "Key Connector error: make sure Key Connector is available and working correctly."
-  }, 
+  },
  "premiumSubcriptionRequired": {
    "message": "Premium subscription required"
  },
--- a/apps/browser/src/_locales/es/messages.json
+++ b/apps/browser/src/_locales/es/messages.json
@@ -1969,7 +1969,7 @@
    "message": "Error en el conector de claves: asegúrate de que el conector de claves está disponible y que funciona correctamente."
  },
  "premiumSubcriptionRequired": {
-    "message": "Premium subscription required"
+    "message": "Se requiere una Suscripción Premium"
  },
  "organizationIsDisabled": {
    "message": "La organización está desactivada."
--- a/apps/browser/src/_locales/fi/messages.json
+++ b/apps/browser/src/_locales/fi/messages.json
@@ -128,7 +128,7 @@
    "message": "Jatka"
  },
  "sendVerificationCode": {
-    "message": "Lähetä vahvistuskoodi sähköpostiisi"
+    "message": "Lähetä todennuskoodi sähköpostiisi"
  },
  "sendCode": {
    "message": "Lähetä koodi"
@@ -1031,7 +1031,7 @@
    "description": "This describes a value that is 'linked' (tied) to another value."
  },
  "popup2faCloseMessage": {
-    "message": "Klikkaus ponnahdusikkunan ulkopuolelle todennuskoodin sähköpostista noutoa varten sulkee ikkunan. Haluatko avata näkymän uuteen ikkunaan, jotta se pysyy avoinna?"
+    "message": "Painallus ponnahdusikkunan ulkopuolelle todennuskoodin sähköpostista noutoa varten sulkee ikkunan. Haluatko avata näkymän uuteen ikkunaan, jotta se pysyy avoinna?"
  },
  "popupU2fCloseMessage": {
    "message": "Tämä selain ei voi käsitellä U2F-pyyntöjä tässä ponnahdusikkunassa. Haluatko avata näkymän uuteen ikkunaan, jotta voit vahvistaa kirjautumisen U2F-todennuslaitteella?"
@@ -1996,6 +1996,6 @@
    "message": "Paina tästä"
  },
  "environmentEditedReset": {
-    "message": "palauttaaksesi esimääritetyt asetukset"
+    "message": "palauttaaksesi oletusasetukset"
  }
 }
--- a/apps/browser/src/_locales/fr/messages.json
+++ b/apps/browser/src/_locales/fr/messages.json
@@ -603,10 +603,10 @@
    "message": "Enregistrer"
  },
  "enableChangedPasswordNotification": {
-    "message": "Ask to update existing login"
+    "message": "Demander à mettre à jour l'identifiant existant"
  },
  "changedPasswordNotificationDesc": {
-    "message": "Ask to update a login's password when a change is detected on a website."
+    "message": "Demander à mettre à jour le mot de passe d'un identifiant lorsqu'un changement est détecté sur un site Web."
  },
  "notificationChangeDesc": {
    "message": "Souhaitez-vous mettre à jour ce mot de passe dans Bitwarden ?"
@@ -615,7 +615,7 @@
    "message": "Mettre à jour"
  },
  "enableContextMenuItem": {
-    "message": "Show context menu options"
+    "message": "Afficher les options du menu contextuel"
  },
  "contextMenuItemDesc": {
    "message": "Use a secondary click to access password generation and matching logins for the website. "
@@ -810,7 +810,7 @@
    "message": "Actualisation terminée"
  },
  "enableAutoTotpCopy": {
-    "message": "Copy TOTP automatically"
+    "message": "Copier le code TOTP automatiquement"
  },
  "disableAutoTotpCopyDesc": {
    "message": "Si une clé d'authentification est rattachée à votre identifiant, alors le code de vérification TOTP est automatiquement copié dans le presse-papiers lorsque vous renseignez l'identifiant."
@@ -1037,10 +1037,10 @@
    "message": "Ce navigateur ne peut pas traiter les requêtes U2F dans cette popup. Voulez-vous ouvrir cette popup dans une nouvelle fenêtre pour que vous puissiez vous connecter en utilisant U2F ?"
  },
  "enableFavicon": {
-    "message": "Show website icons"
+    "message": "Afficher les icônes du site web"
  },
  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+    "message": "Afficher une image reconnaissable à côté de chaque identifiant."
  },
  "enableBadgeCounter": {
    "message": "Show badge counter"
@@ -1484,7 +1484,7 @@
    "message": "En cochant cette case, vous acceptez les éléments suivants :"
  },
  "acceptPoliciesRequired": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "Les Conditions d'Utilisation et la Politique de Confidentialité n'ont pas été acceptées."
  },
  "termsOfService": {
    "message": "Conditions d'utilisation"
@@ -1850,7 +1850,7 @@
    }
  },
  "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "Le délai d'expiration de votre coffre-fort dépasse les restrictions définies par votre organisation."
  },
  "vaultExportDisabled": {
    "message": "Export du coffre désactivé"
@@ -1975,7 +1975,7 @@
    "message": "L'organisation est désactivée."
  },
  "disabledOrganizationFilterError": {
-    "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+    "message": "Les éléments des Organisations désactivées ne sont pas accessibles. Contactez le propriétaire de votre Organisation pour obtenir de l'aide."
  },
  "cardBrandMir": {
    "message": "Mir"
--- a/apps/browser/src/_locales/ja/messages.json
+++ b/apps/browser/src/_locales/ja/messages.json
@@ -342,13 +342,13 @@
    "message": "本人確認を行う"
  },
  "yourVaultIsLocked": {
-    "message": "保管庫がロックされています。開くにはマスターパスワードを入力してください。"
+    "message": "保管庫がロックされています。続行するには本人確認を行ってください。"
  },
  "unlock": {
    "message": "ロック解除"
  },
  "loggedInAsOn": {
-    "message": "$HOSTNAME$ の $EMAIL$ としてログインしました。",
+    "message": "$EMAIL$ として $HOSTNAME$ にログインしました。",
    "placeholders": {
      "email": {
        "content": "$1",
--- a/apps/browser/src/_locales/sr/messages.json
+++ b/apps/browser/src/_locales/sr/messages.json
@@ -1981,7 +1981,7 @@
    "message": "Mir"
  },
  "loggingInTo": {
-    "message": "Logging in to $DOMAIN$",
+    "message": "Пријављивање на $DOMAIN$",
    "placeholders": {
      "domain": {
        "content": "$1",
@@ -1990,12 +1990,12 @@
    }
  },
  "settingsEdited": {
-    "message": "Settings have been edited"
+    "message": "Поставке су уређене"
  },
  "environmentEditedClick": {
-    "message": "Click here"
+    "message": "Кликните овде"
  },
  "environmentEditedReset": {
-    "message": "to reset to pre-configured settings"
+    "message": "за рисетовање на подразумевана подешавања"
  }
 }
--- a/apps/browser/src/_locales/sv/messages.json
+++ b/apps/browser/src/_locales/sv/messages.json
@@ -577,16 +577,16 @@
    "message": "Aviseringar för nya inloggningar frågar dig om du vill lägga till en inloggning automatiskt till ditt valv, när du använder en inloggning som inte redan finns i ditt valv."
  },
  "showCardsCurrentTab": {
-    "message": "Show cards on Tab page"
+    "message": "Visa kort på fliksida"
  },
  "showCardsCurrentTabDesc": {
-    "message": "List card items on the Tab page for easy auto-fill."
+    "message": "Lista kortobjekt på fliksidan för enkel automatisk fyllning."
  },
  "showIdentitiesCurrentTab": {
-    "message": "Show identities on Tab page"
+    "message": "Visa identiteter på fliksidan"
  },
  "showIdentitiesCurrentTabDesc": {
-    "message": "List identity items on the Tab page for easy auto-fill."
+    "message": "Lista identitetsobjekt på fliksidan för enkel automatisk fyllning."
  },
  "clearClipboard": {
    "message": "Rensa urklipp",
@@ -618,7 +618,7 @@
    "message": "Visa alternativ för snabbmenyn"
  },
  "contextMenuItemDesc": {
-    "message": "Use a secondary click to access password generation and matching logins for the website. "
+    "message": "Använd ett andra klick för att komma åt lösenordsgenerering och matchande inloggningar för webbplatsen. "
  },
  "defaultUriMatchDetection": {
    "message": "Standardmatchning för URI",
@@ -1969,7 +1969,7 @@
    "message": "Key Connector-fel: säkerställ att Key Connector är tillgänglig och fungerar korrekt."
  },
  "premiumSubcriptionRequired": {
-    "message": "Premium subscription required"
+    "message": "Premiumabonnemang krävs"
  },
  "organizationIsDisabled": {
    "message": "Organisationen är inaktiverad."
@@ -1981,7 +1981,7 @@
    "message": "Mir"
  },
  "loggingInTo": {
-    "message": "Logging in to $DOMAIN$",
+    "message": "Loggar in på $DOMAIN$",
    "placeholders": {
      "domain": {
        "content": "$1",
@@ -1990,12 +1990,12 @@
    }
  },
  "settingsEdited": {
-    "message": "Settings have been edited"
+    "message": "Inställningarna har ändrats"
  },
  "environmentEditedClick": {
-    "message": "Click here"
+    "message": "Klicka här"
  },
  "environmentEditedReset": {
-    "message": "to reset to pre-configured settings"
+    "message": "för att återställa till förkonfigurerade inställningar"
  }
 }
--- a/apps/browser/src/_locales/uk/messages.json
+++ b/apps/browser/src/_locales/uk/messages.json
@@ -699,7 +699,7 @@
    }
  },
  "moveToOrgDesc": {
-    "message": "Виберіть організацію, до якої ви бажаєте перемістити цей запис. При переміщенні до організації власність запису передається тій організації. Ви більше не будете єдиним власником цього запису після переміщення."
+    "message": "Виберіть організацію, до якої ви бажаєте перемістити цей запис. Переміщуючи до організації, власність запису передається тій організації. Ви більше не будете єдиним власником цього запису після переміщення."
  },
  "learnMore": {
    "message": "Докладніше"
--- a/apps/browser/src/background/commands.background.ts
+++ b/apps/browser/src/background/commands.background.ts
@@ -60,7 +60,7 @@ export default class CommandsBackground {
        await this.openPopup();
        break;
      case "lock_vault":
-        await this.vaultTimeoutService.lock(true);
+        await this.vaultTimeoutService.lock();
        break;
      default:
        break;
--- a/apps/browser/src/background/idle.background.ts
+++ b/apps/browser/src/background/idle.background.ts
@@ -48,7 +48,7 @@ export default class IdleBackground {
            if (action === "logOut") {
              await this.vaultTimeoutService.logOut();
            } else {
-              await this.vaultTimeoutService.lock(true);
+              await this.vaultTimeoutService.lock();
            }
          }
        }
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -235,7 +235,6 @@ export default class MainBackground {
    });
    this.platformUtilsService = new BrowserPlatformUtilsService(
      this.messagingService,
-      this.stateService,
      (clipboardValue, clearMs) => {
        if (this.systemService != null) {
          this.systemService.clearClipboard(clipboardValue, clearMs);
--- a/apps/browser/src/decorators/dev-flag.decorator.ts
+++ b/apps/browser/src/decorators/dev-flag.decorator.ts
@@ -1,6 +1,6 @@
-import { devFlagEnabled, DevFlagName } from "../flags";
+import { devFlagEnabled, DevFlags } from "../flags";

-export function devFlag(flag: DevFlagName) {
+export function devFlag(flag: keyof DevFlags) {
  return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) {
    const originalMethod = descriptor.value;
    descriptor.value = function (...args: any[]) {
--- a/apps/browser/src/decorators/session-sync-observable/session-syncer.spec.ts
+++ b/apps/browser/src/decorators/session-sync-observable/session-syncer.spec.ts
@@ -29,7 +29,7 @@ describe("session syncer", () => {
  afterEach(() => {
    jest.resetAllMocks();

-    behaviorSubject.unsubscribe();
+    behaviorSubject.complete();
  });

  describe("constructor", () => {
--- a/apps/browser/src/decorators/session-sync-observable/session-syncer.ts
+++ b/apps/browser/src/decorators/session-sync-observable/session-syncer.ts
@@ -1,4 +1,4 @@
-import { BehaviorSubject, Subscription } from "rxjs";
+import { BehaviorSubject, concatMap, Subscription } from "rxjs";

 import { Utils } from "@bitwarden/common/misc/utils";

@@ -41,13 +41,17 @@ export class SessionSyncer {
    // This may be a memory leak.
    // There is no good time to unsubscribe from this observable. Hopefully Manifest V3 clears memory from temporary
    // contexts. If so, this is handled by destruction of the context.
-    this.subscription = this.behaviorSubject.subscribe(async (next) => {
-      if (this.ignoreNextUpdate) {
-        this.ignoreNextUpdate = false;
-        return;
-      }
-      await this.updateSession(next);
-    });
+    this.subscription = this.behaviorSubject
+      .pipe(
+        concatMap(async (next) => {
+          if (this.ignoreNextUpdate) {
+            this.ignoreNextUpdate = false;
+            return;
+          }
+          await this.updateSession(next);
+        })
+      )
+      .subscribe();
  }

  private listenForUpdates() {
--- a/apps/browser/src/flags.ts
+++ b/apps/browser/src/flags.ts
@@ -1,61 +1,32 @@
+import {
+  flagEnabled as baseFlagEnabled,
+  devFlagEnabled as baseDevFlagEnabled,
+  devFlagValue as baseDevFlagValue,
+  SharedFlags,
+  SharedDevFlags,
+} from "@bitwarden/common/misc/flags";
+
 import { GroupPolicyEnvironment } from "./types/group-policy-environment";

-function getFlags<T>(envFlags: string | T): T {
-  if (typeof envFlags === "string") {
-    return JSON.parse(envFlags) as T;
-  } else {
-    return envFlags as T;
-  }
-}
+// required to avoid linting errors when there are no flags
+/* eslint-disable-next-line @typescript-eslint/ban-types */
+export type Flags = {} & SharedFlags;

-/* Placeholder for when we have a relevant feature flag
-export type Flags = { test?: boolean };
-export type FlagName = keyof Flags;
-export function flagEnabled(flag: FlagName): boolean {
-  const flags = getFlags<Flags>(process.env.FLAGS);
-  return flags[flag] == null || flags[flag];
-}
-*/
-
-/**
- * These flags are useful for development and testing.
- * Dev Flags are always OFF in production.
- */
+// required to avoid linting errors when there are no flags
+/* eslint-disable-next-line @typescript-eslint/ban-types */
 export type DevFlags = {
  storeSessionDecrypted?: boolean;
  managedEnvironment?: GroupPolicyEnvironment;
-};
+} & SharedDevFlags;

-export type DevFlagName = keyof DevFlags;
-
-/**
- * Gets whether the given dev flag is truthy.
- * Gets the value of a dev flag from environment.
- * Will always return false unless in development.
- * @param flag The name of the dev flag to check
- * @returns The value of the flag
- */
-export function devFlagEnabled(flag: DevFlagName): boolean {
-  if (process.env.ENV !== "development") {
-    return false;
-  }
-
-  const devFlags = getFlags<DevFlags>(process.env.DEV_FLAGS);
-  return devFlags[flag] == null || !!devFlags[flag];
+export function flagEnabled(flag: keyof Flags): boolean {
+  return baseFlagEnabled<Flags>(flag);
 }

-/**
- * Gets the value of a dev flag from environment.
- * Will always return false unless in development.
- * @param flag The name of the dev flag to check
- * @returns The value of the flag
- * @throws Error if the flag is not enabled
- */
-export function devFlagValue<K extends DevFlagName>(flag: K): DevFlags[K] {
-  if (!devFlagEnabled(flag)) {
-    throw new Error(`This method should not be called, it is protected by a disabled dev flag.`);
-  }
-
-  const devFlags = getFlags<DevFlags>(process.env.DEV_FLAGS);
-  return devFlags[flag];
+export function devFlagEnabled(flag: keyof DevFlags) {
+  return baseDevFlagEnabled<DevFlags>(flag);
+}
+
+export function devFlagValue(flag: keyof DevFlags) {
+  return baseDevFlagValue(flag);
 }
--- a/apps/browser/src/listeners/onCommandListener.ts
+++ b/apps/browser/src/listeners/onCommandListener.ts
@@ -66,7 +66,6 @@ const doAutoFillLogin = async (tab: chrome.tabs.Tab): Promise<void> => {

  const platformUtils = new BrowserPlatformUtilsService(
    null, // MessagingService
-    stateService,
    null, // clipboardWriteCallback
    null // biometricCallback
  );
--- a/apps/browser/src/manifest.v3.json
+++ b/apps/browser/src/manifest.v3.json
@@ -124,5 +124,8 @@
    "default_title": "Bitwarden",
    "default_panel": "popup/index.html?uilocation=sidebar",
    "default_icon": "images/icon19.png"
+  },
+  "storage": {
+    "managed_schema": "managed_schema.json"
  }
 }
--- a/apps/browser/src/popup/accounts/set-password.component.ts
+++ b/apps/browser/src/popup/accounts/set-password.component.ts
@@ -6,6 +6,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
+import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction";
 import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction";
@@ -30,7 +31,8 @@ export class SetPasswordComponent extends BaseSetPasswordComponent {
    policyService: PolicyService,
    router: Router,
    syncService: SyncService,
-    route: ActivatedRoute
+    route: ActivatedRoute,
+    organizationApiService: OrganizationApiServiceAbstraction
  ) {
    super(
      i18nService,
@@ -44,7 +46,8 @@ export class SetPasswordComponent extends BaseSetPasswordComponent {
      apiService,
      syncService,
      route,
-      stateService
+      stateService,
+      organizationApiService
    );
  }
 }
--- a/apps/browser/src/popup/accounts/two-factor.component.ts
+++ b/apps/browser/src/popup/accounts/two-factor.component.ts
@@ -109,6 +109,7 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
      }
    }

+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
    this.route.queryParams.pipe(first()).subscribe(async (qParams) => {
      if (qParams.sso === "true") {
        super.onSuccessfulLogin = () => {
--- a/apps/browser/src/popup/app.component.ts
+++ b/apps/browser/src/popup/app.component.ts
@@ -35,7 +35,7 @@ export class AppComponent implements OnInit, OnDestroy {
  private lastActivity: number = null;
  private activeUserId: string;

-  private destroy$: Subject<void> = new Subject<void>();
+  private destroy$ = new Subject<void>();

  constructor(
    private toastrService: ToastrService,
@@ -132,6 +132,7 @@ export class AppComponent implements OnInit, OnDestroy {

    BrowserApi.messageListener("app.component", (window as any).bitwardenPopupMainMessageListener);

+    // eslint-disable-next-line rxjs/no-async-subscribe
    this.router.events.pipe(takeUntil(this.destroy$)).subscribe(async (event) => {
      if (event instanceof NavigationEnd) {
        const url = event.urlAfterRedirects || event.url || "";
--- a/apps/browser/src/popup/app.module.ts
+++ b/apps/browser/src/popup/app.module.ts
@@ -18,6 +18,7 @@ import localeEnGb from "@angular/common/locales/en-GB";
 import localeEnIn from "@angular/common/locales/en-IN";
 import localeEs from "@angular/common/locales/es";
 import localeEt from "@angular/common/locales/et";
+import localeEu from "@angular/common/locales/eu";
 import localeFa from "@angular/common/locales/fa";
 import localeFi from "@angular/common/locales/fi";
 import localeFil from "@angular/common/locales/fil";
@@ -129,6 +130,7 @@ registerLocaleData(localeEnGb, "en-GB");
 registerLocaleData(localeEnIn, "en-IN");
 registerLocaleData(localeEs, "es");
 registerLocaleData(localeEt, "et");
+registerLocaleData(localeEu, "eu");
 registerLocaleData(localeFa, "fa");
 registerLocaleData(localeFi, "fi");
 registerLocaleData(localeFil, "fil");
--- a/apps/browser/src/popup/generator/generator.component.html
+++ b/apps/browser/src/popup/generator/generator.component.html
@@ -349,6 +349,18 @@
            />
          </div>
        </ng-container>
+        <ng-container *ngIf="usernameOptions.forwardedService === 'duckduckgo'">
+          <div class="box-content-row" appBoxRow>
+            <label for="duckduckgo-apikey">{{ "apiKey" | i18n }}</label>
+            <input
+              id="duckduckgo-apikey"
+              type="password"
+              name="DuckDudkGoApiKey"
+              [(ngModel)]="usernameOptions.forwardedDuckDuckGoToken"
+              (blur)="saveUsernameOptions()"
+            />
+          </div>
+        </ng-container>
        <ng-container *ngIf="usernameOptions.forwardedService === 'anonaddy'">
          <div class="box-content-row" appBoxRow>
            <label for="anonaddy-accessToken">{{ "apiAccessToken" | i18n }}</label>
@@ -383,6 +395,18 @@
            />
          </div>
        </ng-container>
+        <ng-container *ngIf="usernameOptions.forwardedService === 'fastmail'">
+          <div class="box-content-row" appBoxRow>
+            <label for="fastmail-apiToken">{{ "apiAccessToken" | i18n }}</label>
+            <input
+              id="fastmail-apiToken"
+              type="password"
+              name="FastmailApiToken"
+              [(ngModel)]="usernameOptions.forwardedFastmailApiToken"
+              (blur)="saveUsernameOptions()"
+            />
+          </div>
+        </ng-container>
      </div>
    </div>
    <div class="box" *ngIf="usernameOptions.type === 'subaddress'">
--- a/apps/browser/src/popup/send/send-add-edit.component.ts
+++ b/apps/browser/src/popup/send/send-add-edit.component.ts
@@ -19,6 +19,7 @@ import { PopupUtilsService } from "../services/popup-utils.service";
  selector: "app-send-add-edit",
  templateUrl: "send-add-edit.component.html",
 })
+// eslint-disable-next-line rxjs-angular/prefer-takeuntil
 export class SendAddEditComponent extends BaseAddEditComponent {
  // Options header
  showOptions = false;
@@ -98,6 +99,7 @@ export class SendAddEditComponent extends BaseAddEditComponent {
    this.isUnsupportedMac =
      this.platformUtilsService.isChrome() && window?.navigator?.appVersion.includes("Mac OS X 11");

+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
    this.route.queryParams.pipe(first()).subscribe(async (params) => {
      if (params.sendId) {
        this.sendId = params.sendId;
--- a/apps/browser/src/popup/send/send-type.component.ts
+++ b/apps/browser/src/popup/send/send-type.component.ts
@@ -70,6 +70,7 @@ export class SendTypeComponent extends BaseSendComponent {
  async ngOnInit() {
    // Let super class finish
    await super.ngOnInit();
+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
    this.route.queryParams.pipe(first()).subscribe(async (params) => {
      if (this.applySavedState) {
        this.state = await this.stateService.getBrowserSendTypeComponentState();
--- a/apps/browser/src/popup/settings/folder-add-edit.component.ts
+++ b/apps/browser/src/popup/settings/folder-add-edit.component.ts
@@ -13,6 +13,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti
  selector: "app-folder-add-edit",
  templateUrl: "folder-add-edit.component.html",
 })
+// eslint-disable-next-line rxjs-angular/prefer-takeuntil
 export class FolderAddEditComponent extends BaseFolderAddEditComponent {
  constructor(
    folderService: FolderService,
@@ -27,6 +28,7 @@ export class FolderAddEditComponent extends BaseFolderAddEditComponent {
  }

  async ngOnInit() {
+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
    this.route.queryParams.pipe(first()).subscribe(async (params) => {
      if (params.folderId) {
        this.folderId = params.folderId;
--- a/apps/browser/src/popup/settings/settings.component.ts
+++ b/apps/browser/src/popup/settings/settings.component.ts
@@ -37,6 +37,7 @@ const RateUrls = {
  selector: "app-settings",
  templateUrl: "settings.component.html",
 })
+// eslint-disable-next-line rxjs-angular/prefer-takeuntil
 export class SettingsComponent implements OnInit {
  @ViewChild("vaultTimeoutActionSelect", { read: ElementRef, static: true })
  vaultTimeoutActionSelectRef: ElementRef;
@@ -102,6 +103,7 @@ export class SettingsComponent implements OnInit {
      this.vaultTimeout.setValue(timeout);
    }
    this.previousVaultTimeout = this.vaultTimeout.value;
+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
    this.vaultTimeout.valueChanges.subscribe(async (value) => {
      await this.saveVaultTimeout(value);
    });
@@ -302,7 +304,7 @@ export class SettingsComponent implements OnInit {
  }

  async lock() {
-    await this.vaultTimeoutService.lock(true);
+    await this.vaultTimeoutService.lock();
  }

  async logOut() {
--- a/apps/browser/src/popup/vault/add-edit-custom-fields.component.html
+++ b/apps/browser/src/popup/vault/add-edit-custom-fields.component.html
@@ -6,11 +6,13 @@
    <!-- Current custom fields -->
    <div cdkDropList (cdkDropListDropped)="drop($event)" *ngIf="cipher.hasFields">
      <div
+        role="group"
        class="box-content-row box-content-row-multi box-draggable-row"
        appBoxRow
        cdkDrag
        *ngFor="let f of cipher.fields; let i = index; trackBy: trackByFunction"
        [ngClass]="{ 'box-content-row-checkbox': f.type === fieldType.Boolean }"
+        attr.aria-label="{{ f.name }}"
      >
        <button
          type="button"
@@ -41,6 +43,7 @@
            *ngIf="f.type === fieldType.Text"
            placeholder="{{ 'value' | i18n }}"
            appInputVerbatim
+            attr.aria-describedby="fieldName{{ i }}"
          />
          <!-- Hidden -->
          <input
@@ -53,6 +56,7 @@
            *ngIf="f.type === fieldType.Hidden"
            placeholder="{{ 'value' | i18n }}"
            [disabled]="!cipher.viewPassword && !f.newField"
+            attr.aria-describedby="fieldName{{ i }}"
          />
          <!-- Linked -->
          <select
@@ -60,6 +64,7 @@
            name="Field.Value{{ i }}"
            [(ngModel)]="f.linkedId"
            *ngIf="f.type === fieldType.Linked && cipher.linkedFieldOptions != null"
+            attr.aria-describedby="fieldName{{ i }}"
          >
            <option *ngFor="let o of linkedFieldOptions" [ngValue]="o.value">{{ o.name }}</option>
          </select>
@@ -74,6 +79,7 @@
          appTrueFalseValue
          trueValue="true"
          falseValue="false"
+          attr.aria-describedby="fieldName{{ i }}"
        />
        <div
          class="action-buttons"
--- a/apps/browser/src/popup/vault/add-edit.component.html
+++ b/apps/browser/src/popup/vault/add-edit.component.html
@@ -402,9 +402,11 @@
      <div class="box-content">
        <ng-container *ngIf="cipher.login.hasUris">
          <div
+            role="group"
            class="box-content-row box-content-row-multi"
            appBoxRow
            *ngFor="let u of cipher.login.uris; let i = index; trackBy: trackByFunction"
+            attr.aria-label="{{ 'uriPosition' | i18n: i + 1 }}"
          >
            <button
              type="button"
--- a/apps/browser/src/popup/vault/add-edit.component.ts
+++ b/apps/browser/src/popup/vault/add-edit.component.ts
@@ -27,6 +27,7 @@ import { PopupUtilsService } from "../services/popup-utils.service";
  selector: "app-vault-add-edit",
  templateUrl: "add-edit.component.html",
 })
+// eslint-disable-next-line rxjs-angular/prefer-takeuntil
 export class AddEditComponent extends BaseAddEditComponent {
  currentUris: string[];
  showAttachments = true;
@@ -72,6 +73,7 @@ export class AddEditComponent extends BaseAddEditComponent {
  async ngOnInit() {
    await super.ngOnInit();

+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
    this.route.queryParams.pipe(first()).subscribe(async (params) => {
      if (params.cipherId) {
        this.cipherId = params.cipherId;
--- a/apps/browser/src/popup/vault/attachments.component.ts
+++ b/apps/browser/src/popup/vault/attachments.component.ts
@@ -17,6 +17,7 @@ import { StateService } from "@bitwarden/common/abstractions/state.service";
  selector: "app-vault-attachments",
  templateUrl: "attachments.component.html",
 })
+// eslint-disable-next-line rxjs-angular/prefer-takeuntil
 export class AttachmentsComponent extends BaseAttachmentsComponent {
  openedAttachmentsInPopup: boolean;

@@ -46,6 +47,7 @@ export class AttachmentsComponent extends BaseAttachmentsComponent {
  }

  async ngOnInit() {
+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
    this.route.queryParams.pipe(first()).subscribe(async (params) => {
      this.cipherId = params.cipherId;
      await this.init();
--- a/apps/browser/src/popup/vault/ciphers.component.ts
+++ b/apps/browser/src/popup/vault/ciphers.component.ts
@@ -80,6 +80,7 @@ export class CiphersComponent extends BaseCiphersComponent implements OnInit, On
    this.searchTypeSearch = !this.platformUtilsService.isSafari();
    this.showOrganizations = await this.organizationService.hasOrganizations();
    this.vaultFilter = this.vaultFilterService.getVaultFilter();
+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
    this.route.queryParams.pipe(first()).subscribe(async (params) => {
      if (this.applySavedState) {
        this.state = await this.stateService.getBrowserCipherComponentState();
--- a/apps/browser/src/popup/vault/collections.component.ts
+++ b/apps/browser/src/popup/vault/collections.component.ts
@@ -14,6 +14,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti
  selector: "app-vault-collections",
  templateUrl: "collections.component.html",
 })
+// eslint-disable-next-line rxjs-angular/prefer-takeuntil
 export class CollectionsComponent extends BaseCollectionsComponent {
  constructor(
    collectionService: CollectionService,
@@ -28,9 +29,11 @@ export class CollectionsComponent extends BaseCollectionsComponent {
  }

  async ngOnInit() {
+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
    this.onSavedCollections.subscribe(() => {
      this.back();
    });
+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
    this.route.queryParams.pipe(first()).subscribe(async (params) => {
      this.cipherId = params.cipherId;
      await this.load();
--- a/apps/browser/src/popup/vault/password-history.component.ts
+++ b/apps/browser/src/popup/vault/password-history.component.ts
@@ -12,6 +12,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti
  selector: "app-password-history",
  templateUrl: "password-history.component.html",
 })
+// eslint-disable-next-line rxjs-angular/prefer-takeuntil
 export class PasswordHistoryComponent extends BasePasswordHistoryComponent {
  constructor(
    cipherService: CipherService,
@@ -24,6 +25,7 @@ export class PasswordHistoryComponent extends BasePasswordHistoryComponent {
  }

  async ngOnInit() {
+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
    this.route.queryParams.pipe(first()).subscribe(async (params) => {
      if (params.cipherId) {
        this.cipherId = params.cipherId;
--- a/apps/browser/src/popup/vault/share.component.ts
+++ b/apps/browser/src/popup/vault/share.component.ts
@@ -14,6 +14,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti
  selector: "app-vault-share",
  templateUrl: "share.component.html",
 })
+// eslint-disable-next-line rxjs-angular/prefer-takeuntil
 export class ShareComponent extends BaseShareComponent {
  constructor(
    collectionService: CollectionService,
@@ -36,9 +37,11 @@ export class ShareComponent extends BaseShareComponent {
  }

  async ngOnInit() {
+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
    this.onSharedCipher.subscribe(() => {
      this.router.navigate(["view-cipher", { cipherId: this.cipherId }]);
    });
+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
    this.route.queryParams.pipe(first()).subscribe(async (params) => {
      this.cipherId = params.cipherId;
      await this.load();
--- a/apps/browser/src/popup/vault/vault-filter.component.ts
+++ b/apps/browser/src/popup/vault/vault-filter.component.ts
@@ -114,6 +114,7 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
    });

    const restoredScopeState = await this.restoreState();
+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
    this.route.queryParams.pipe(first()).subscribe(async (params) => {
      this.state = await this.browserStateService.getBrowserGroupingComponentState();
      if (this.state?.searchText) {
--- a/apps/browser/src/popup/vault/vault-select.component.ts
+++ b/apps/browser/src/popup/vault/vault-select.component.ts
@@ -47,6 +47,7 @@ import { VaultFilterService } from "../../services/vaultFilter.service";
    ]),
  ],
 })
+// eslint-disable-next-line rxjs-angular/prefer-takeuntil
 export class VaultSelectComponent implements OnInit {
  @Output() onVaultSelectionChanged = new EventEmitter();

@@ -168,6 +169,7 @@ export class VaultSelectComponent implements OnInit {
      this.overlayRef.outsidePointerEvents(),
      this.overlayRef.backdropClick(),
      this.overlayRef.detachments()
+      // eslint-disable-next-line rxjs-angular/prefer-takeuntil
    ).subscribe(() => {
      this.close();
    });
--- a/apps/browser/src/popup/vault/view.component.ts
+++ b/apps/browser/src/popup/vault/view.component.ts
@@ -88,6 +88,7 @@ export class ViewComponent extends BaseViewComponent {

  ngOnInit() {
    this.inPopout = this.popupUtilsService.inPopout(window);
+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
    this.route.queryParams.pipe(first()).subscribe(async (params) => {
      if (params.cipherId) {
        this.cipherId = params.cipherId;
--- a/apps/browser/src/services/browserPlatformUtils.service.spec.ts
+++ b/apps/browser/src/services/browserPlatformUtils.service.spec.ts
@@ -16,7 +16,7 @@ describe("Browser Utils Service", () => {
    let browserPlatformUtilsService: BrowserPlatformUtilsService;
    beforeEach(() => {
      (window as any).matchMedia = jest.fn().mockReturnValueOnce({});
-      browserPlatformUtilsService = new BrowserPlatformUtilsService(null, null, null, null);
+      browserPlatformUtilsService = new BrowserPlatformUtilsService(null, null, null);
    });

    afterEach(() => {
--- a/apps/browser/src/services/browserPlatformUtils.service.ts
+++ b/apps/browser/src/services/browserPlatformUtils.service.ts
@@ -5,7 +5,6 @@ import { DeviceType } from "@bitwarden/common/enums/deviceType";

 import { BrowserApi } from "../browser/browserApi";
 import { SafariApp } from "../browser/safariApp";
-import { StateService } from "../services/abstractions/state.service";

 const DialogPromiseExpiration = 600000; // 10 minutes

@@ -19,7 +18,6 @@ export default class BrowserPlatformUtilsService implements PlatformUtilsService

  constructor(
    private messagingService: MessagingService,
-    private stateService: StateService,
    private clipboardWriteCallback: (clipboardValue: string, clearMs: number) => void,
    private biometricCallback: () => Promise<boolean>
  ) {}
--- a/apps/browser/src/services/folders/folder.service.ts
+++ b/apps/browser/src/services/folders/folder.service.ts
@@ -1,4 +1,4 @@
-import { BehaviorSubject } from "rxjs/internal/BehaviorSubject";
+import { BehaviorSubject } from "rxjs";

 import { Folder } from "@bitwarden/common/models/domain/folder";
 import { FolderView } from "@bitwarden/common/models/view/folderView";
--- a/apps/browser/src/services/i18n.service.ts
+++ b/apps/browser/src/services/i18n.service.ts
@@ -25,6 +25,7 @@ export default class I18nService extends BaseI18nService {
      "en-IN",
      "es",
      "et",
+      "eu",
      "fa",
      "fi",
      "fil",
--- a/apps/cli/spec/utils.spec.ts
+++ b/apps/cli/spec/utils.spec.ts
@@ -1,27 +0,0 @@
-import { FlagName } from "../src/flags";
-import { CliUtils } from "../src/utils";
-describe("flagEnabled", () => {
-  it("is true if flag is null", () => {
-    process.env.FLAGS = JSON.stringify({ test: null });
-
-    expect(CliUtils.flagEnabled("test" as FlagName)).toBe(true);
-  });
-
-  it("is true if flag is undefined", () => {
-    process.env.FLAGS = JSON.stringify({});
-
-    expect(CliUtils.flagEnabled("test" as FlagName)).toBe(true);
-  });
-
-  it("is true if flag is true", () => {
-    process.env.FLAGS = JSON.stringify({ test: true });
-
-    expect(CliUtils.flagEnabled("test" as FlagName)).toBe(true);
-  });
-
-  it("is false if flag is false", () => {
-    process.env.FLAGS = JSON.stringify({ test: false });
-
-    expect(CliUtils.flagEnabled("test" as FlagName)).toBe(false);
-  });
-});
--- a/apps/cli/src/bw.ts
+++ b/apps/cli/src/bw.ts
@@ -5,6 +5,7 @@ import * as program from "commander";
 import * as jsdom from "jsdom";

 import { InternalFolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
+import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction";
 import { ClientType } from "@bitwarden/common/enums/clientType";
 import { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions";
 import { LogLevelType } from "@bitwarden/common/enums/logLevelType";
@@ -30,6 +31,7 @@ import { KeyConnectorService } from "@bitwarden/common/services/keyConnector.ser
 import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service";
 import { NoopMessagingService } from "@bitwarden/common/services/noopMessaging.service";
 import { OrganizationService } from "@bitwarden/common/services/organization.service";
+import { OrganizationApiService } from "@bitwarden/common/services/organization/organization-api.service";
 import { PasswordGenerationService } from "@bitwarden/common/services/passwordGeneration.service";
 import { PolicyService } from "@bitwarden/common/services/policy/policy.service";
 import { ProviderService } from "@bitwarden/common/services/provider.service";
@@ -58,7 +60,7 @@ import { NodeEnvSecureStorageService } from "./services/nodeEnvSecureStorage.ser
 import { VaultProgram } from "./vault.program";

 // Polyfills
-(global as any).DOMParser = new jsdom.JSDOM().window.DOMParser;
+global.DOMParser = new jsdom.JSDOM().window.DOMParser;

 // eslint-disable-next-line
 const packageJson = require("../package.json");
@@ -108,6 +110,7 @@ export class Main {
  broadcasterService: BroadcasterService;
  folderApiService: FolderApiService;
  userVerificationApiService: UserVerificationApiService;
+  organizationApiService: OrganizationApiServiceAbstraction;

  constructor() {
    let p = null;
@@ -185,6 +188,9 @@ export class Main {
      async (expired: boolean) => await this.logout(),
      customUserAgent
    );
+
+    this.organizationApiService = new OrganizationApiService(this.apiService);
+
    this.containerService = new ContainerService(this.cryptoService);

    this.settingsService = new SettingsService(this.stateService);
@@ -317,7 +323,6 @@ export class Main {
      this.apiService,
      this.i18nService,
      this.collectionService,
-      this.platformUtilsService,
      this.cryptoService
    );
    this.exportService = new ExportService(
--- a/apps/cli/src/commands/convertToKeyConnector.command.ts
+++ b/apps/cli/src/commands/convertToKeyConnector.command.ts
@@ -1,18 +1,18 @@
 import * as inquirer from "inquirer";

-import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
 import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service";
+import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction";
 import { SyncService } from "@bitwarden/common/abstractions/sync.service";
 import { Response } from "@bitwarden/node/cli/models/response";
 import { MessageResponse } from "@bitwarden/node/cli/models/response/messageResponse";

 export class ConvertToKeyConnectorCommand {
  constructor(
-    private apiService: ApiService,
    private keyConnectorService: KeyConnectorService,
    private environmentService: EnvironmentService,
    private syncService: SyncService,
+    private organizationApiService: OrganizationApiServiceAbstraction,
    private logout: () => Promise<void>
  ) {}

@@ -72,7 +72,7 @@ export class ConvertToKeyConnectorCommand {

      return Response.success();
    } else if (answer.convert === "leave") {
-      await this.apiService.postLeaveOrganization(organization.id);
+      await this.organizationApiService.leave(organization.id);
      await this.keyConnectorService.removeConvertAccountRequired();
      await this.syncService.fullSync(true);
      return Response.success();
--- a/apps/cli/src/commands/serve.command.ts
+++ b/apps/cli/src/commands/serve.command.ts
@@ -121,6 +121,7 @@ export class ServeCommand {
      this.main.keyConnectorService,
      this.main.environmentService,
      this.main.syncService,
+      this.main.organizationApiService,
      async () => await this.main.logout()
    );

--- a/apps/cli/src/commands/unlock.command.ts
+++ b/apps/cli/src/commands/unlock.command.ts
@@ -3,6 +3,7 @@ import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
 import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
 import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service";
+import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { SyncService } from "@bitwarden/common/abstractions/sync.service";
 import { HashPurpose } from "@bitwarden/common/enums/hashPurpose";
@@ -26,6 +27,7 @@ export class UnlockCommand {
    private keyConnectorService: KeyConnectorService,
    private environmentService: EnvironmentService,
    private syncService: SyncService,
+    private organizationApiService: OrganizationApiServiceAbstraction,
    private logout: () => Promise<void>
  ) {}

@@ -78,10 +80,10 @@ export class UnlockCommand {

      if (await this.keyConnectorService.getConvertAccountRequired()) {
        const convertToKeyConnectorCommand = new ConvertToKeyConnectorCommand(
-          this.apiService,
          this.keyConnectorService,
          this.environmentService,
          this.syncService,
+          this.organizationApiService,
          this.logout
        );
        const convertResponse = await convertToKeyConnectorCommand.run();
--- a/apps/cli/src/flags.ts
+++ b/apps/cli/src/flags.ts
@@ -1,5 +1,27 @@
-// Remove this linter hint if any flags exist
-// eslint-disable-next-line @typescript-eslint/ban-types
-export type Flags = {};
+import {
+  flagEnabled as baseFlagEnabled,
+  devFlagEnabled as baseDevFlagEnabled,
+  devFlagValue as baseDevFlagValue,
+  SharedFlags,
+  SharedDevFlags,
+} from "@bitwarden/common/misc/flags";

-export type FlagName = keyof Flags;
+// required to avoid linting errors when there are no flags
+/* eslint-disable-next-line @typescript-eslint/ban-types */
+export type Flags = {} & SharedFlags;
+
+// required to avoid linting errors when there are no flags
+/* eslint-disable-next-line @typescript-eslint/ban-types */
+export type DevFlags = {} & SharedDevFlags;
+
+export function flagEnabled(flag: keyof Flags): boolean {
+  return baseFlagEnabled<Flags>(flag);
+}
+
+export function devFlagEnabled(flag: keyof DevFlags) {
+  return baseDevFlagEnabled<DevFlags>(flag);
+}
+
+export function devFlagValue(flag: keyof DevFlags) {
+  return baseDevFlagValue(flag);
+}
--- a/apps/cli/src/locales/en/messages.json
+++ b/apps/cli/src/locales/en/messages.json
@@ -15,7 +15,10 @@
    "message": "No Folder"
  },
  "importEncKeyError": {
-    "message": "Invalid file password."
+    "message": "Error decrypting the exported file. Your encryption key does not match the encryption key used export the data."
+  },
+  "invalidFilePassword": {
+    "message": "Invalid file password, please use the password you entered when you created the export file."
  },
  "importPasswordRequired": {
    "message": "File is password protected, please provide a decryption password."
--- a/apps/cli/src/program.ts
+++ b/apps/cli/src/program.ts
@@ -260,6 +260,7 @@ export class Program extends BaseProgram {
            this.main.keyConnectorService,
            this.main.environmentService,
            this.main.syncService,
+            this.main.organizationApiService,
            async () => await this.main.logout()
          );
          const response = await command.run(password, cmd);
@@ -534,6 +535,7 @@ export class Program extends BaseProgram {
          this.main.keyConnectorService,
          this.main.environmentService,
          this.main.syncService,
+          this.main.organizationApiService,
          this.main.logout
        );
        const response = await command.run(null, null);
--- a/apps/cli/src/utils.ts
+++ b/apps/cli/src/utils.ts
@@ -13,8 +13,6 @@ import { FolderView } from "@bitwarden/common/models/view/folderView";
 import { Response } from "@bitwarden/node/cli/models/response";
 import { MessageResponse } from "@bitwarden/node/cli/models/response/messageResponse";

-import { FlagName, Flags } from "./flags";
-
 export class CliUtils {
  static writeLn(s: string, finalLine = false, error = false) {
    const stream = error ? process.stderr : process.stdout;
@@ -253,18 +251,4 @@ export class CliUtils {
  static convertBooleanOption(optionValue: any) {
    return optionValue || optionValue === "" ? true : false;
  }
-
-  static flagEnabled(flag: FlagName) {
-    return this.flags[flag] == null || this.flags[flag];
-  }
-
-  private static get flags(): Flags {
-    const envFlags = process.env.FLAGS;
-
-    if (typeof envFlags === "string") {
-      return JSON.parse(envFlags) as Flags;
-    } else {
-      return envFlags as Flags;
-    }
-  }
 }
--- a/apps/desktop/src/app/accounts/lock.component.ts
+++ b/apps/desktop/src/app/accounts/lock.component.ts
@@ -69,6 +69,7 @@ export class LockComponent extends BaseLockComponent {
    const forcePasswordReset = await this.stateService.getForcePasswordReset();
    this.successRoute = forcePasswordReset === true ? this.unAuthenicatedUrl : this.authenicatedUrl;

+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
    this.route.queryParams.subscribe((params) => {
      if (this.supportsBiometric && params.promptBiometric && autoPromptBiometric) {
        setTimeout(async () => {
--- a/apps/desktop/src/app/accounts/login.component.ts
+++ b/apps/desktop/src/app/accounts/login.component.ts
@@ -102,13 +102,16 @@ export class LoginComponent extends BaseLoginComponent implements OnDestroy {
      this.environmentModal
    );

+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
    modal.onShown.subscribe(() => {
      this.showingModal = true;
    });
+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
    modal.onClosed.subscribe(() => {
      this.showingModal = false;
    });

+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
    childComponent.onSaved.subscribe(() => {
      modal.close();
    });
--- a/apps/desktop/src/app/accounts/set-password.component.ts
+++ b/apps/desktop/src/app/accounts/set-password.component.ts
@@ -7,6 +7,7 @@ import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.s
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
+import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction";
 import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction";
@@ -35,7 +36,8 @@ export class SetPasswordComponent extends BaseSetPasswordComponent implements On
    route: ActivatedRoute,
    private broadcasterService: BroadcasterService,
    private ngZone: NgZone,
-    stateService: StateService
+    stateService: StateService,
+    organizationApiService: OrganizationApiServiceAbstraction
  ) {
    super(
      i18nService,
@@ -49,13 +51,14 @@ export class SetPasswordComponent extends BaseSetPasswordComponent implements On
      apiService,
      syncService,
      route,
-      stateService
+      stateService,
+      organizationApiService
    );
  }

  async ngOnInit() {
    await super.ngOnInit();
-    this.broadcasterService.subscribe(BroadcasterSubscriptionId, async (message: any) => {
+    this.broadcasterService.subscribe(BroadcasterSubscriptionId, async (message) => {
      this.ngZone.run(() => {
        switch (message.command) {
          case "windowHidden":
--- a/apps/desktop/src/app/accounts/settings.component.ts
+++ b/apps/desktop/src/app/accounts/settings.component.ts
@@ -24,6 +24,7 @@ import { DeleteAccountComponent } from "./delete-account.component";
  selector: "app-settings",
  templateUrl: "settings.component.html",
 })
+// eslint-disable-next-line rxjs-angular/prefer-takeuntil
 export class SettingsComponent implements OnInit {
  vaultTimeoutAction: string;
  pin: boolean = null;
@@ -178,6 +179,7 @@ export class SettingsComponent implements OnInit {
    this.vaultTimeout.setValue(await this.stateService.getVaultTimeout());
    this.vaultTimeoutAction = await this.stateService.getVaultTimeoutAction();
    this.previousVaultTimeout = this.vaultTimeout.value;
+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
    this.vaultTimeout.valueChanges.pipe(debounceTime(500)).subscribe(() => {
      this.saveVaultTimeoutOptions();
    });
--- a/apps/desktop/src/app/accounts/two-factor.component.ts
+++ b/apps/desktop/src/app/accounts/two-factor.component.ts
@@ -21,6 +21,7 @@ import { TwoFactorOptionsComponent } from "./two-factor-options.component";
  selector: "app-two-factor",
  templateUrl: "two-factor.component.html",
 })
+// eslint-disable-next-line rxjs-angular/prefer-takeuntil
 export class TwoFactorComponent extends BaseTwoFactorComponent {
  @ViewChild("twoFactorOptions", { read: ViewContainerRef, static: true })
  twoFactorOptionsModal: ViewContainerRef;
@@ -67,18 +68,22 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
      this.twoFactorOptionsModal
    );

+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
    modal.onShown.subscribe(() => {
      this.showingModal = true;
    });
+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
    modal.onClosed.subscribe(() => {
      this.showingModal = false;
    });

+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
    childComponent.onProviderSelected.subscribe(async (provider: TwoFactorProviderType) => {
      modal.close();
      this.selectedProviderType = provider;
      await this.init();
    });
+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
    childComponent.onRecoverSelected.subscribe(() => {
      modal.close();
    });
--- a/apps/desktop/src/app/app.component.ts
+++ b/apps/desktop/src/app/app.component.ts
@@ -98,7 +98,7 @@ export class AppComponent implements OnInit, OnDestroy {
  private isIdle = false;
  private activeUserId: string = null;

-  private destroy$: Subject<void> = new Subject<void>();
+  private destroy$ = new Subject<void>();

  constructor(
    private broadcasterService: BroadcasterService,
@@ -170,12 +170,12 @@ export class AppComponent implements OnInit, OnDestroy {
            this.loading = false;
            break;
          case "lockVault":
-            await this.vaultTimeoutService.lock(true, message.userId);
+            await this.vaultTimeoutService.lock(message.userId);
            break;
          case "lockAllVaults":
            for (const userId in this.stateService.accounts.getValue()) {
              if (userId != null) {
-                await this.vaultTimeoutService.lock(true, userId);
+                await this.vaultTimeoutService.lock(userId);
              }
            }
            break;
@@ -377,10 +377,12 @@ export class AppComponent implements OnInit, OnDestroy {
    );
    this.modal = modal;

+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
    childComponent.onSaved.subscribe(() => {
      this.modal.close();
    });

+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
    this.modal.onClosed.subscribe(() => {
      this.modal = null;
    });
@@ -396,11 +398,13 @@ export class AppComponent implements OnInit, OnDestroy {
    );
    this.modal = modal;

+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
    childComponent.onSavedFolder.subscribe(async () => {
      this.modal.close();
      this.syncService.fullSync(false);
    });

+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
    this.modal.onClosed.subscribe(() => {
      this.modal = null;
    });
@@ -415,6 +419,7 @@ export class AppComponent implements OnInit, OnDestroy {
      (comp) => (comp.comingFromAddEdit = false)
    );

+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
    this.modal.onClosed.subscribe(() => {
      this.modal = null;
    });
@@ -539,6 +544,7 @@ export class AppComponent implements OnInit, OnDestroy {

    [this.modal] = await this.modalService.openViewRef(type, ref);

+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
    this.modal.onClosed.subscribe(() => {
      this.modal = null;
    });
@@ -593,7 +599,7 @@ export class AppComponent implements OnInit, OnDestroy {
      if (options[0] === timeout) {
        options[1] === "logOut"
          ? this.logOut(false, userId)
-          : await this.vaultTimeoutService.lock(true, userId);
+          : await this.vaultTimeoutService.lock(userId);
      }
    }
  }
--- a/apps/desktop/src/app/app.module.ts
+++ b/apps/desktop/src/app/app.module.ts
@@ -17,6 +17,7 @@ import localeEnIn from "@angular/common/locales/en-IN";
 import localeEo from "@angular/common/locales/eo";
 import localeEs from "@angular/common/locales/es";
 import localeEt from "@angular/common/locales/et";
+import localeEu from "@angular/common/locales/eu";
 import localeFa from "@angular/common/locales/fa";
 import localeFi from "@angular/common/locales/fi";
 import localeFil from "@angular/common/locales/fil";
@@ -117,6 +118,7 @@ registerLocaleData(localeEnIn, "en-IN");
 registerLocaleData(localeEo, "eo");
 registerLocaleData(localeEs, "es");
 registerLocaleData(localeEt, "et");
+registerLocaleData(localeEu, "eu");
 registerLocaleData(localeFa, "fa");
 registerLocaleData(localeFi, "fi");
 registerLocaleData(localeFil, "fil");
--- a/apps/desktop/src/app/layout/account-switcher.component.ts
+++ b/apps/desktop/src/app/layout/account-switcher.component.ts
@@ -48,6 +48,7 @@ export class SwitcherAccount extends Account {
    ]),
  ],
 })
+// eslint-disable-next-line rxjs-angular/prefer-takeuntil
 export class AccountSwitcherComponent implements OnInit {
  isOpen = false;
  accounts: { [userId: string]: SwitcherAccount } = {};
@@ -84,6 +85,7 @@ export class AccountSwitcherComponent implements OnInit {
  ) {}

  async ngOnInit(): Promise<void> {
+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
    this.stateService.accounts.subscribe(async (accounts: { [userId: string]: Account }) => {
      for (const userId in accounts) {
        accounts[userId].profile.authenticationStatus = await this.authService.getAuthStatus(
--- a/apps/desktop/src/app/layout/search/search.component.ts
+++ b/apps/desktop/src/app/layout/search/search.component.ts
@@ -17,16 +17,19 @@ export class SearchComponent implements OnInit, OnDestroy {
  private activeAccountSubscription: Subscription;

  constructor(private searchBarService: SearchBarService, private stateService: StateService) {
+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
    this.searchBarService.state$.subscribe((state) => {
      this.state = state;
    });

+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
    this.searchText.valueChanges.subscribe((value) => {
      this.searchBarService.setSearchText(value);
    });
  }

  ngOnInit() {
+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
    this.activeAccountSubscription = this.stateService.activeAccount$.subscribe((value) => {
      this.searchBarService.setSearchText("");
      this.searchText.patchValue("");
--- a/apps/desktop/src/app/send/send.component.ts
+++ b/apps/desktop/src/app/send/send.component.ts
@@ -56,6 +56,7 @@ export class SendComponent extends BaseSendComponent implements OnInit, OnDestro
      policyService,
      logService
    );
+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
    this.searchBarService.searchText$.subscribe((searchText) => {
      this.searchText = searchText;
      this.searchTextChanged();
--- a/apps/desktop/src/app/vault/add-edit-custom-fields.component.html
+++ b/apps/desktop/src/app/vault/add-edit-custom-fields.component.html
@@ -5,10 +5,12 @@
  <div class="box-content">
    <div cdkDropList (cdkDropListDropped)="drop($event)" *ngIf="cipher.hasFields">
      <div
+        role="group"
        class="box-content-row box-content-row-multi box-draggable-row"
        cdkDrag
        *ngFor="let f of cipher.fields; let i = index; trackBy: trackByFunction"
        [ngClass]="{ 'box-content-row-checkbox': f.type === fieldType.Boolean }"
+        attr.aria-label="{{ f.name }}"
      >
        <button
          type="button"
@@ -39,6 +41,7 @@
            *ngIf="f.type === fieldType.Text"
            placeholder="{{ 'value' | i18n }}"
            appInputVerbatim
+            attr.aria-describedby="fieldName{{ i }}"
          />
          <!-- Password -->
          <input
@@ -51,6 +54,7 @@
            placeholder="{{ 'value' | i18n }}"
            [disabled]="!cipher.viewPassword && !f.newField"
            appInputVerbatim
+            attr.aria-describedby="fieldName{{ i }}"
          />
          <!-- Linked -->
          <select
@@ -58,6 +62,7 @@
            name="Field.Value{{ i }}"
            [(ngModel)]="f.linkedId"
            *ngIf="f.type === fieldType.Linked && cipher.linkedFieldOptions != null"
+            attr.aria-describedby="fieldName{{ i }}"
          >
            <option *ngFor="let o of linkedFieldOptions" [ngValue]="o.value">{{ o.name }}</option>
          </select>
@@ -72,6 +77,7 @@
          appTrueFalseValue
          trueValue="true"
          falseValue="false"
+          attr.aria-describedby="fieldName{{ i }}"
        />
        <div
          class="action-buttons"
@@ -84,6 +90,7 @@
            appA11yTitle="{{ 'toggleVisibility' | i18n }}"
            [attr.aria-pressed]="f.showValue"
            (click)="toggleFieldValue(f)"
+            attr.aria-describedby="fieldName{{ i }}"
          >
            <i
              class="bwi bwi-lg"
--- a/apps/desktop/src/app/vault/add-edit.component.html
+++ b/apps/desktop/src/app/vault/add-edit.component.html
@@ -391,9 +391,11 @@
        <div class="box-content">
          <ng-container *ngIf="cipher.login.hasUris">
            <div
+              role="group"
              class="box-content-row box-content-row-multi"
              appBoxRow
              *ngFor="let u of cipher.login.uris; let i = index; trackBy: trackByFunction"
+              attr.aria-label="{{ 'uriPosition' | i18n: i + 1 }}"
            >
              <button
                type="button"
--- a/apps/desktop/src/app/vault/ciphers.component.ts
+++ b/apps/desktop/src/app/vault/ciphers.component.ts
@@ -10,10 +10,12 @@ import { SearchBarService } from "../layout/search/search-bar.service";
  selector: "app-vault-ciphers",
  templateUrl: "ciphers.component.html",
 })
+// eslint-disable-next-line rxjs-angular/prefer-takeuntil
 export class CiphersComponent extends BaseCiphersComponent {
  constructor(searchService: SearchService, searchBarService: SearchBarService) {
    super(searchService);

+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
    searchBarService.searchText$.subscribe((searchText) => {
      this.searchText = searchText;
      this.search(200);
--- a/apps/desktop/src/app/vault/generator.component.html
+++ b/apps/desktop/src/app/vault/generator.component.html
@@ -382,6 +382,18 @@
                  />
                </div>
              </ng-container>
+              <ng-container *ngIf="usernameOptions.forwardedService === 'duckduckgo'">
+                <div class="box-content-row" appBoxRow>
+                  <label for="duckduckgo-apikey">{{ "apiKey" | i18n }}</label>
+                  <input
+                    id="duckduckgo-apikey"
+                    type="password"
+                    name="DuckDudkGoApiKey"
+                    [(ngModel)]="usernameOptions.forwardedDuckDuckGoToken"
+                    (blur)="saveUsernameOptions()"
+                  />
+                </div>
+              </ng-container>
              <ng-container *ngIf="usernameOptions.forwardedService === 'anonaddy'">
                <div class="box-content-row" appBoxRow>
                  <label for="anonaddy-accessToken">{{ "apiAccessToken" | i18n }}</label>
@@ -416,6 +428,18 @@
                  />
                </div>
              </ng-container>
+              <ng-container *ngIf="usernameOptions.forwardedService === 'fastmail'">
+                <div class="box-content-row" appBoxRow>
+                  <label for="fastmail-apiToken">{{ "apiAccessToken" | i18n }}</label>
+                  <input
+                    id="fastmail-apiToken"
+                    type="password"
+                    name="FastmailApiToken"
+                    [(ngModel)]="usernameOptions.forwardedFastmailApiToken"
+                    (blur)="saveUsernameOptions()"
+                  />
+                </div>
+              </ng-container>
            </div>
          </div>
          <div class="box" *ngIf="usernameOptions.type === 'subaddress'" [hidden]="!showOptions">
--- a/apps/desktop/src/app/vault/vault.component.ts
+++ b/apps/desktop/src/app/vault/vault.component.ts
@@ -216,6 +216,7 @@ export class VaultComponent implements OnInit, OnDestroy {
  }

  async load() {
+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
    this.route.queryParams.pipe(first()).subscribe(async (params) => {
      if (params.cipherId) {
        const cipherView = new CipherView();
@@ -458,9 +459,12 @@ export class VaultComponent implements OnInit, OnDestroy {
    this.modal = modal;

    let madeAttachmentChanges = false;
+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
    childComponent.onUploadedAttachment.subscribe(() => (madeAttachmentChanges = true));
+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
    childComponent.onDeletedAttachment.subscribe(() => (madeAttachmentChanges = true));

+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
    this.modal.onClosed.subscribe(async () => {
      this.modal = null;
      if (madeAttachmentChanges) {
@@ -482,11 +486,13 @@ export class VaultComponent implements OnInit, OnDestroy {
    );
    this.modal = modal;

+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
    childComponent.onSharedCipher.subscribe(async () => {
      this.modal.close();
      this.viewCipher(cipher);
      await this.ciphersComponent.refresh();
    });
+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
    this.modal.onClosed.subscribe(async () => {
      this.modal = null;
    });
@@ -504,10 +510,12 @@ export class VaultComponent implements OnInit, OnDestroy {
    );
    this.modal = modal;

+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
    childComponent.onSavedCollections.subscribe(() => {
      this.modal.close();
      this.viewCipher(cipher);
    });
+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
    this.modal.onClosed.subscribe(async () => {
      this.modal = null;
    });
@@ -524,6 +532,7 @@ export class VaultComponent implements OnInit, OnDestroy {
      (comp) => (comp.cipherId = cipher.id)
    );

+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
    this.modal.onClosed.subscribe(async () => {
      this.modal = null;
    });
@@ -596,6 +605,7 @@ export class VaultComponent implements OnInit, OnDestroy {
    );
    this.modal = modal;

+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
    childComponent.onSelected.subscribe((value: string) => {
      this.modal.close();
      if (loginType) {
@@ -608,6 +618,7 @@ export class VaultComponent implements OnInit, OnDestroy {
      }
    });

+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
    this.modal.onClosed.subscribe(() => {
      this.modal = null;
    });
@@ -629,15 +640,18 @@ export class VaultComponent implements OnInit, OnDestroy {
    );
    this.modal = modal;

+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
    childComponent.onSavedFolder.subscribe(async (folder: FolderView) => {
      this.modal.close();
      await this.vaultFilterComponent.reloadCollectionsAndFolders(this.activeFilter);
    });
+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
    childComponent.onDeletedFolder.subscribe(async (folder: FolderView) => {
      this.modal.close();
      await this.vaultFilterComponent.reloadCollectionsAndFolders(this.activeFilter);
    });

+    // eslint-disable-next-line rxjs-angular/prefer-takeuntil
    this.modal.onClosed.subscribe(() => {
      this.modal = null;
    });
--- a/apps/desktop/src/flags.ts
+++ b/apps/desktop/src/flags.ts
@@ -0,0 +1,27 @@
+import {
+  flagEnabled as baseFlagEnabled,
+  devFlagEnabled as baseDevFlagEnabled,
+  devFlagValue as baseDevFlagValue,
+  SharedFlags,
+  SharedDevFlags,
+} from "@bitwarden/common/misc/flags";
+
+// required to avoid linting errors when there are no flags
+/* eslint-disable-next-line @typescript-eslint/ban-types */
+export type Flags = {} & SharedFlags;
+
+// required to avoid linting errors when there are no flags
+/* eslint-disable-next-line @typescript-eslint/ban-types */
+export type DevFlags = {} & SharedDevFlags;
+
+export function flagEnabled(flag: keyof Flags): boolean {
+  return baseFlagEnabled<Flags>(flag);
+}
+
+export function devFlagEnabled(flag: keyof DevFlags) {
+  return baseDevFlagEnabled<DevFlags>(flag);
+}
+
+export function devFlagValue(flag: keyof DevFlags) {
+  return baseDevFlagValue(flag);
+}
--- a/apps/desktop/src/locales/af/messages.json
+++ b/apps/desktop/src/locales/af/messages.json
@@ -1980,16 +1980,16 @@
    "message": "API-sleutel"
  },
  "premiumSubcriptionRequired": {
-    "message": "Premium subscription required"
+    "message": "Premie-intekening word vereis"
  },
  "organizationIsDisabled": {
    "message": "Organisasie is gedeaktiveer."
  },
  "disabledOrganizationFilterError": {
-    "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+    "message": "Items in gedeaktiveerde organisasies is ontoeganklik. Kontak u organisasie-eienaar vir bystand."
  },
  "neverLockWarning": {
-    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+    "message": "Is u seker u wil die “Nooit”-opsie gebruik? Deur u vergrendelopsies op “Nooit” te stel word u kluis se enkripsie op u toestel bewaar. Indien u hierdie opsie gebruik moet u verseker dat u toestel behoorlik beskerm is."
  },
  "cardBrandMir": {
    "message": "Mir"
--- a/apps/desktop/src/locales/ar/messages.json
+++ b/apps/desktop/src/locales/ar/messages.json
@@ -1394,19 +1394,19 @@
    "message": "قفل مع كلمة المرور الرئيسية عند إعادة تشغيل"
  },
  "deleteAccount": {
-    "message": "Delete account"
+    "message": "حذف الحساب"
  },
  "deleteAccountDesc": {
-    "message": "Proceed below to delete your account and all vault data."
+    "message": "تابع أدناه لحذف حسابك وجميع بيانات خزنتك."
  },
  "deleteAccountWarning": {
-    "message": "Deleting your account is permanent. It cannot be undone."
+    "message": "حذف حسابك دائم. لا يمكن التراجع عنه."
  },
  "accountDeleted": {
-    "message": "Account deleted"
+    "message": "تم حذف الحساب"
  },
  "accountDeletedDesc": {
-    "message": "Your account has been closed and all associated data has been deleted."
+    "message": "لقد تم إغلاق حسابك وتم حذف جميع البيانات المرتبطة به."
  },
  "preferences": {
    "message": "التفضيلات"
@@ -1980,7 +1980,7 @@
    "message": "مفتاح API"
  },
  "premiumSubcriptionRequired": {
-    "message": "Premium subscription required"
+    "message": "الاشتراك المميز مطلوب"
  },
  "organizationIsDisabled": {
    "message": "تم تعطيل المؤسسة."
--- a/apps/desktop/src/locales/be/messages.json
+++ b/apps/desktop/src/locales/be/messages.json
@@ -361,7 +361,7 @@
    "message": "Выдаліць далучэнне"
  },
  "deleteItemConfirmation": {
-    "message": "Вы ўпэўнены, што хочаце выдаліць гэты элемент?"
+    "message": "Вы сапраўды хочаце адправіць элемент у сметніцу?"
  },
  "deletedItem": {
    "message": "Элемент адпраўлены ў сметніцу"
@@ -560,7 +560,7 @@
    "message": "Няма элементаў для паказу."
  },
  "sendVerificationCode": {
-    "message": "Адправіць код праверкі на вашу электронную пошту"
+    "message": "Адправіць праверачны код на вашу электронную пошту"
  },
  "sendCode": {
    "message": "Адправіць код"
@@ -608,7 +608,7 @@
    "message": "Запомніць мяне"
  },
  "sendVerificationCodeEmailAgain": {
-    "message": "Адправіць код пацвярджэння зноў"
+    "message": "Адправіць праверачны код яшчэ раз"
  },
  "useAnotherTwoStepMethod": {
    "message": "Выкарыстоўваць іншы метад двухэтапнага ўваходу"
@@ -1305,26 +1305,26 @@
    "message": "Гатова"
  },
  "accessibilityCookieSaved": {
-    "message": "Accessibility cookie saved!"
+    "message": "Cookie са спецыяльнымі магчымасцямі захаваны!"
  },
  "noAccessibilityCookieSaved": {
-    "message": "No accessibility cookie saved"
+    "message": "Адсутнічаюць захаваныя cookie са спецыяльнымі магчымасцямі"
  },
  "warning": {
    "message": "УВАГА",
    "description": "WARNING (should stay in capitalized letters if the language permits)"
  },
  "confirmVaultExport": {
-    "message": "Confirm Vault Export"
+    "message": "Пацвердзіць экспартаванне сховішча"
  },
  "exportWarningDesc": {
    "message": "Экспартуемы файл утрымлівае даныя вашага сховішча ў незашыфраваным фармаце. Яго не варта захоўваць ці адпраўляць па небяспечным каналам (напрыклад, па электроннай пошце). Выдаліце яго адразу пасля выкарыстання."
  },
  "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."
+    "message": "Падчас экспартавання даныя шыфруюцца з дапамогай ключа шыфравання ўліковага запісу. Калі вы калі-небудзь зменіце ключ шыфравання ўліковага запісу, вам неабходна будзе экспартаваць даныя паўторна, паколькі вы не зможаце расшыфраваць гэты файл экспартавання."
  },
  "encExportAccountWarningDesc": {
-    "message": "Account encryption keys are unique to each Bitwarden user account, so you can't import an encrypted export into a different account."
+    "message": "Ключы шыфравання з'яўляюцца ўнікальнымі для кожнага ўліковага запісу Bitwarden, таму нельга імпартаваць зашыфраванае сховішча ў іншы ўліковы запіс."
  },
  "noOrganizationsList": {
    "message": "Вы не з'яўляецеся членам якой-небудзь арганізацыі. Арганізацыі дазваляюць бяспечна абменьвацца элементамі з іншымі карыстальнікамі."
@@ -1385,16 +1385,16 @@
    "message": "Праверыць на Bitwarden."
  },
  "autoPromptWindowsHello": {
-    "message": "Ask for Windows Hello on launch"
+    "message": "Запытваць Windows Hello пры запуску"
  },
  "autoPromptTouchId": {
-    "message": "Ask for Touch ID on launch"
+    "message": "Запытваць Touch ID пры запуску"
  },
  "lockWithMasterPassOnRestart": {
    "message": "Блакіраваць асноўным паролем пры перазапуску"
  },
  "deleteAccount": {
-    "message": "Delete account"
+    "message": "Выдаліць уліковы запіс"
  },
  "deleteAccountDesc": {
    "message": "Proceed below to delete your account and all vault data."
@@ -1613,7 +1613,7 @@
    "message": "An organization policy is affecting your ownership options."
  },
  "allSends": {
-    "message": "Усе адпраўленні",
+    "message": "Усе Send'ы",
    "description": "'Sends' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
  },
  "sendTypeFile": {
@@ -1623,11 +1623,11 @@
    "message": "Тэкст"
  },
  "searchSends": {
-    "message": "Пошук адпраўленняў",
+    "message": "Пошук Send'аў",
    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
  },
  "editSend": {
-    "message": "Рэдагаваць адпраўленне",
+    "message": "Рэдагаваць Send",
    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
  },
  "myVault": {
@@ -1640,7 +1640,7 @@
    "message": "Дата выдалення"
  },
  "deletionDateDesc": {
-    "message": "The Send will be permanently deleted on the specified date and time.",
+    "message": "Send будзе незваротна выдалены ў азначаныя дату і час.",
    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
  },
  "expirationDate": {
@@ -1651,7 +1651,7 @@
    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
  },
  "maxAccessCount": {
-    "message": "Maximum Access Count",
+    "message": "Максімальная колькасць доступаў",
    "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
  },
  "maxAccessCountDesc": {
@@ -1674,27 +1674,27 @@
    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
  },
  "sendLink": {
-    "message": "Даслаць спасылку",
+    "message": "Адправіць спасылку",
    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
  },
  "sendLinkLabel": {
-    "message": "Send Link",
+    "message": "Адправіць спасылку",
    "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",
+    "message": "Прадвызначана хаваць тэкст, калі адбываецца доступ да Send",
    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
  },
  "createdSend": {
-    "message": "Created Send",
+    "message": "Створаны Send",
    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
  },
  "editedSend": {
-    "message": "Edited Send",
+    "message": "Адрэдагаваны Send",
    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
  },
  "deletedSend": {
-    "message": "Deleted Send",
+    "message": "Выдалены Send",
    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
  },
  "newPassword": {
@@ -1705,7 +1705,7 @@
    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
  },
  "createSend": {
-    "message": "Стварыць адпраўленне",
+    "message": "Стварыць Send",
    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
  },
  "sendTextDesc": {
@@ -1734,7 +1734,7 @@
    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
  },
  "copySendLinkToClipboard": {
-    "message": "Скапіяваць спасылку адпраўлення ў буфер абмену",
+    "message": "Капіяваць спасылку на Send у буфер абмену",
    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
  },
  "copySendLinkOnSave": {
--- a/apps/desktop/src/locales/da/messages.json
+++ b/apps/desktop/src/locales/da/messages.json
@@ -1980,7 +1980,7 @@
    "message": "API-nøgle"
  },
  "premiumSubcriptionRequired": {
-    "message": "Premium subscription required"
+    "message": "Premium-abonnement kræves"
  },
  "organizationIsDisabled": {
    "message": "Organisationen er deaktiveret."
--- a/apps/desktop/src/locales/de/messages.json
+++ b/apps/desktop/src/locales/de/messages.json
@@ -587,7 +587,7 @@
    "message": "Gib den 6-stelligen Verifizierungscode aus deiner Authentifizierungs-App ein."
  },
  "enterVerificationCodeEmail": {
-    "message": "Gib den 6-stelligen Bestätigungscode ein, der an $EMAIL$ gesendet wurde.",
+    "message": "Gib den 6-stelligen Verifizierungscode ein, der an $EMAIL$ gesendet wurde.",
    "placeholders": {
      "email": {
        "content": "$1",
@@ -988,7 +988,7 @@
    "description": "Copy to clipboard"
  },
  "checkForUpdates": {
-    "message": "Auf Updates prüfen"
+    "message": "Auf Updates prüfen …"
  },
  "version": {
    "message": "Version $VERSION_NUM$",
@@ -1803,7 +1803,7 @@
    "message": "Minuten"
  },
  "vaultTimeoutPolicyInEffect": {
-    "message": "Deine Unternehmensrichtlinien beeinflussen dein Tresor-Timeout. Das maximal zulässige Tresor-Timeout ist $HOURS$ Stunde(n) und $MINUTES$ Minute(n)",
+    "message": "Die Unternehmensrichtlinien beeinflussen deinen Tresor-Timeout. Das maximal zulässige Tresor-Timeout ist $HOURS$ Stunde(n) und $MINUTES$ Minute(n)",
    "placeholders": {
      "hours": {
        "content": "$1",
@@ -1864,7 +1864,7 @@
    "message": "Alle Tresore sperren"
  },
  "accountLimitReached": {
-    "message": "Es dürfen nicht mehr als 5 Konten gleichzeitig angemeldet sein."
+    "message": "Es dürfen nicht mehr als fünf Konten gleichzeitig angemeldet sein."
  },
  "accountPreferences": {
    "message": "Einstellungen"
@@ -1921,7 +1921,7 @@
    "message": "Passworttyp"
  },
  "regenerateUsername": {
-    "message": "Benutzername neu generieren"
+    "message": "Benutzernamen neu generieren"
  },
  "generateUsername": {
    "message": "Benutzernamen generieren"
@@ -1958,7 +1958,7 @@
    "message": "Alle Tresore"
  },
  "searchOrganization": {
-    "message": "Organisationen durchsuchen"
+    "message": "Organisation durchsuchen"
  },
  "searchMyVault": {
    "message": "Meinen Tresor durchsuchen"
--- a/apps/desktop/src/locales/eo/messages.json
+++ b/apps/desktop/src/locales/eo/messages.json
@@ -145,7 +145,7 @@
    "message": "Brand"
  },
  "expiration": {
-    "message": "Validoperiodo"
+    "message": "Eksvalidiĝo"
  },
  "securityCode": {
    "message": "Kodo de sekureco"
--- a/apps/desktop/src/locales/es/messages.json
+++ b/apps/desktop/src/locales/es/messages.json
@@ -1980,7 +1980,7 @@
    "message": "Clave API"
  },
  "premiumSubcriptionRequired": {
-    "message": "Premium subscription required"
+    "message": "Se requiere una Suscripción Premium"
  },
  "organizationIsDisabled": {
    "message": "La organización está desactivada."
--- a/apps/desktop/src/locales/fi/messages.json
+++ b/apps/desktop/src/locales/fi/messages.json
@@ -560,7 +560,7 @@
    "message": "Ei näytettäviä kohteita."
  },
  "sendVerificationCode": {
-    "message": "Lähetä vahvistuskoodi sähköpostiisi"
+    "message": "Lähetä todennuskoodi sähköpostiisi"
  },
  "sendCode": {
    "message": "Lähetä koodi"
@@ -578,7 +578,7 @@
    "message": "Todennuskoodi vaaditaan."
  },
  "invalidVerificationCode": {
-    "message": "Virheellinen vahvistuskoodi"
+    "message": "Virheellinen todennuskoodi"
  },
  "continue": {
    "message": "Jatka"
--- a/apps/desktop/src/locales/fr/messages.json
+++ b/apps/desktop/src/locales/fr/messages.json
@@ -533,13 +533,13 @@
    "message": "Adresse e-mail invalide."
  },
  "masterPasswordRequired": {
-    "message": "Master password is required."
+    "message": "Le mot de passe maître est requis."
  },
  "confirmMasterPasswordRequired": {
-    "message": "Master password retype is required."
+    "message": "Le mot de passe maître doit être entré de nouveau."
  },
  "masterPasswordMinlength": {
-    "message": "Master password must be at least 8 characters long."
+    "message": "Le mot de passe maître doit au moins contenir 8 caractères."
  },
  "masterPassDoesntMatch": {
    "message": "La confirmation du mot de passe maître ne correspond pas."
@@ -898,10 +898,10 @@
    "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
  },
  "enableFavicon": {
-    "message": "Show website icons"
+    "message": "Afficher les icônes du site web"
  },
  "faviconDesc": {
-    "message": "Show a recognizable image next to each login."
+    "message": "Afficher une image reconnaissable à côté de chaque identifiant."
  },
  "enableMinToTray": {
    "message": "Réduire dans la barre d'outils"
@@ -1394,19 +1394,19 @@
    "message": "Verrouiller avec le mot de passe maître lors du redémarrage"
  },
  "deleteAccount": {
-    "message": "Delete account"
+    "message": "Supprimer le compte"
  },
  "deleteAccountDesc": {
-    "message": "Proceed below to delete your account and all vault data."
+    "message": "Continuez ci-dessous pour supprimer votre compte et toutes les données associées."
  },
  "deleteAccountWarning": {
-    "message": "Deleting your account is permanent. It cannot be undone."
+    "message": "La suppression de votre compte est définitive. Cette action ne peut pas être annulée."
  },
  "accountDeleted": {
-    "message": "Account deleted"
+    "message": "Compte supprimé"
  },
  "accountDeletedDesc": {
-    "message": "Your account has been closed and all associated data has been deleted."
+    "message": "Votre compte a été fermé et toutes les données associées ont été supprimées."
  },
  "preferences": {
    "message": "Préférences"
@@ -1562,7 +1562,7 @@
    "message": "En cochant cette case, vous acceptez les éléments suivants :"
  },
  "acceptPoliciesRequired": {
-    "message": "Terms of Service and Privacy Policy have not been acknowledged."
+    "message": "Les Conditions d'Utilisation et la Politique de Confidentialité n'ont pas été acceptées."
  },
  "enableBrowserIntegration": {
    "message": "Activer l'intégration avec le navigateur"
@@ -1980,16 +1980,16 @@
    "message": "Clé d'IPA"
  },
  "premiumSubcriptionRequired": {
-    "message": "Premium subscription required"
+    "message": "Abonnement Premium requis"
  },
  "organizationIsDisabled": {
-    "message": "Organization is disabled."
+    "message": "L'organisation est désactivée."
  },
  "disabledOrganizationFilterError": {
-    "message": "Items in disabled Organizations cannot be accessed. Contact your Organization owner for assistance."
+    "message": "Les éléments des Organisations désactivées ne sont pas accessibles. Contactez le propriétaire de votre Organisation pour obtenir de l'aide."
  },
  "neverLockWarning": {
-    "message": "Are you sure you want to use the \"Never\" option? Setting your lock options to \"Never\" stores your vault's encryption key on your device. If you use this option you should ensure that you keep your device properly protected."
+    "message": "Êtes-vous sûr de vouloir utiliser l'option \"Jamais\" ? Définir le verrouillage sur \"Jamais\" stocke la clé de chiffrement de votre coffre sur votre appareil. Si vous utilisez cette option, vous devez vous assurer de correctement protéger votre appareil."
  },
  "cardBrandMir": {
    "message": "Mir"
--- a/apps/desktop/src/locales/pl/messages.json
+++ b/apps/desktop/src/locales/pl/messages.json
@@ -1403,7 +1403,7 @@
    "message": "Usunięcie konta jest nieodwracalne. Ta czynność nie może zostać cofnięta."
  },
  "accountDeleted": {
-    "message": "Konto usunięte"
+    "message": "Konto zostało usunięte"
  },
  "accountDeletedDesc": {
    "message": "Konto zostało zamknięte i wszystkie powiązane z nim dane zostały usunięte."
--- a/apps/desktop/src/locales/sr/messages.json
+++ b/apps/desktop/src/locales/sr/messages.json
@@ -1980,7 +1980,7 @@
    "message": "АПИ Кључ"
  },
  "premiumSubcriptionRequired": {
-    "message": "Premium subscription required"
+    "message": "Premium претплата је потребна"
  },
  "organizationIsDisabled": {
    "message": "Организација је онемогућена."
--- a/apps/desktop/src/locales/th/messages.json
+++ b/apps/desktop/src/locales/th/messages.json
@@ -12,7 +12,7 @@
    "message": "รายการโปรด"
  },
  "types": {
-    "message": "Types"
+    "message": "ประเภท"
  },
  "typeLogin": {
    "message": "เข้าสู่ระบบ"
@@ -42,13 +42,13 @@
    "message": "แบ่งปัน"
  },
  "share": {
-    "message": "Share"
+    "message": "แชร์"
  },
  "moveToOrganization": {
-    "message": "Move to Organization"
+    "message": "ย้ายไปที่องค์กร"
  },
  "movedItemToOrg": {
-    "message": "$ITEMNAME$ moved to $ORGNAME$",
+    "message": "$ITEMNAME$ ย้ายไปที่ $ORGNAME$ แล้ว",
    "placeholders": {
      "itemname": {
        "content": "$1",
@@ -61,10 +61,10 @@
    }
  },
  "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."
+    "message": "เลือกองค์กรที่คุณต้องการย้ายรายการนี้ไป การย้ายไปยังองค์กรจะเป็นการโอนความเป็นเจ้าของรายการไปยังองค์กรนั้น คุณจะไม่ได้เป็นเจ้าของโดยตรงของรายการนี้อีกต่อไปเมื่อมีการย้าย"
  },
  "attachments": {
-    "message": "Attachments"
+    "message": "ไฟล์แนบ"
  },
  "viewItem": {
    "message": "ดูรายการ"
@@ -86,7 +86,7 @@
    }
  },
  "newUri": {
-    "message": "New URI"
+    "message": "URL ใหม่"
  },
  "username": {
    "message": "ชื่อผู้ใช้"
@@ -110,13 +110,13 @@
    "message": "เว็บไซต์"
  },
  "notes": {
-    "message": "Notes"
+    "message": "โน๊ต"
  },
  "customFields": {
    "message": "Custom Fields"
  },
  "launch": {
-    "message": "Launch"
+    "message": "เริ่ม"
  },
  "copyValue": {
    "message": "คัดลอกค่า",
@@ -269,7 +269,7 @@
    "message": "นามสกุล"
  },
  "fullName": {
-    "message": "Full Name"
+    "message": "ชื่อเต็ม"
  },
  "address1": {
    "message": "ที่อยู่ 1"
@@ -401,16 +401,16 @@
    "message": "ความยาว"
  },
  "uppercase": {
-    "message": "Uppercase (A-Z)"
+    "message": "ตัวพิมพ์ใหญ่ (A-Z)"
  },
  "lowercase": {
-    "message": "Lowercase (a-z)"
+    "message": "ตัวพิมพ์เล็ก (a-z)"
  },
  "numbers": {
-    "message": "Numbers (0-9)"
+    "message": "หมายเลข (0-9)"
  },
  "specialCharacters": {
-    "message": "Special Characters (!@#$%^&*)"
+    "message": "อักขระพิเศษ (!@#$%^&*)"
  },
  "numWords": {
    "message": "Number of Words"
@@ -419,7 +419,7 @@
    "message": "Word Separator"
  },
  "capitalize": {
-    "message": "Capitalize",
+    "message": "ขึ้นต้นด้วยตัวพิมพ์ใหญ่",
    "description": "Make the first letter of a work uppercase."
  },
  "includeNumber": {
@@ -563,19 +563,19 @@
    "message": "Send a verification code to your email"
  },
  "sendCode": {
-    "message": "Send Code"
+    "message": "ส่งรหัส"
  },
  "codeSent": {
-    "message": "Code Sent"
+    "message": "ส่งรหัสแล้ว"
  },
  "verificationCode": {
    "message": "รหัสยืนยัน"
  },
  "confirmIdentity": {
-    "message": "Confirm your identity to continue."
+    "message": "ยืนยันตัวตนของคุณเพื่อดำเนินการต่อ"
  },
  "verificationCodeRequired": {
-    "message": "Verification code is required."
+    "message": "จำเป็นต้องมีรหัสการตรวจสอบยืนยัน"
  },
  "invalidVerificationCode": {
    "message": "Invalid verification code"
@@ -758,16 +758,16 @@
    "message": "ตัวสร้างรหัสผ่าน"
  },
  "contactUs": {
-    "message": "Contact Us"
+    "message": "ติดต่อเรา"
  },
  "getHelp": {
-    "message": "Get Help"
+    "message": "ขอความช่วยเหลือ"
  },
  "fileBugReport": {
    "message": "File a Bug Report"
  },
  "blog": {
-    "message": "Blog"
+    "message": "บล็อก"
  },
  "followUs": {
    "message": "Follow Us"
@@ -779,7 +779,7 @@
    "message": "เปลี่ยนรหัสผ่านหลัก"
  },
  "changeMasterPasswordConfirmation": {
-    "message": "You can change your master password on the bitwarden.com web vault. Do you want to visit the website now?"
+    "message": "คุณสามารถเปลี่ยนรหัสผ่านหลักของคุณได้ที่เว็บ bitwarden.com คุณต้องการไปที่เว็บไซต์ตอนนี้ไหม?"
  },
  "fingerprintPhrase": {
    "message": "Fingerprint Phrase",
@@ -799,19 +799,19 @@
    "message": "Get Browser Extension"
  },
  "syncingComplete": {
-    "message": "Syncing complete"
+    "message": "การซิงก์เสร็จสมบูรณ์"
  },
  "syncingFailed": {
-    "message": "Syncing failed"
+    "message": "การซิงก์ล้มเหลว"
  },
  "yourVaultIsLocked": {
-    "message": "Your vault is locked. Verify your identity to continue."
+    "message": "ตู้เซฟของคุณถูกล็อก ยืนยันตัวตนของคุณเพื่อดำเนินการต่อ"
  },
  "unlock": {
-    "message": "Unlock"
+    "message": "ปลดล็อค"
  },
  "loggedInAsOn": {
-    "message": "Logged in as $EMAIL$ on $HOSTNAME$.",
+    "message": "ล็อกอินด้วย $EMAIL$ บน $HOSTNAME$",
    "placeholders": {
      "email": {
        "content": "$1",
@@ -824,10 +824,10 @@
    }
  },
  "invalidMasterPassword": {
-    "message": "Invalid master password"
+    "message": "รหัสผ่านหลักไม่ถูกต้อง"
  },
  "twoStepLoginConfirmation": {
-    "message": "Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be enabled on the bitwarden.com web vault. Do you want to visit the website now?"
+    "message": "การเข้าสู่ระบบแบบสองขั้นตอนทำให้บัญชีของคุณมีความปลอดภัยมากขึ้นด้วยการให้คุณตรวจสอบการเข้าสู่ระบบของคุณกับอุปกรณ์อื่นเช่นคีย์ความปลอดภัย, แอพ authenticator, SMS, โทรศัพท์หรืออีเมล. เข้าสู่ระบบแบบสองขั้นตอนสามารถเปิดใช้งานบน เว็บนิรภัย bitwarden.com คุณต้องการเยี่ยมชมเว็บไซต์เดี๋ยวนี้หรือไม่"
  },
  "twoStepLogin": {
    "message": "เข้าสู่ระบบแบบสองขั้นตอน"
@@ -842,19 +842,19 @@
    "message": "ทันที"
  },
  "tenSeconds": {
-    "message": "10 seconds"
+    "message": "10 วินาที"
  },
  "twentySeconds": {
-    "message": "20 seconds"
+    "message": "20 วินาที"
  },
  "thirtySeconds": {
-    "message": "30 seconds"
+    "message": "30 วินาที"
  },
  "oneMinute": {
    "message": "1 นาที"
  },
  "twoMinutes": {
-    "message": "2 minutes"
+    "message": "2 นาที"
  },
  "fiveMinutes": {
    "message": "5 นาที"
@@ -884,13 +884,13 @@
    "message": "On Restart"
  },
  "never": {
-    "message": "Never"
+    "message": "ไม่อีกเลย"
  },
  "security": {
-    "message": "Security"
+    "message": "ความปลอดภัย"
  },
  "clearClipboard": {
-    "message": "Clear clipboard",
+    "message": "ล้างคลิปบอร์ด",
    "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
  },
  "clearClipboardDesc": {
@@ -898,7 +898,7 @@
    "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
  },
  "enableFavicon": {
-    "message": "Show website icons"
+    "message": "โชว์ไอคอนเว็บไซต์"
  },
  "faviconDesc": {
    "message": "Show a recognizable image next to each login."
@@ -964,23 +964,23 @@
    "message": "Disabling this setting will also disable all other tray related settings."
  },
  "language": {
-    "message": "Language"
+    "message": "ภาษา"
  },
  "languageDesc": {
-    "message": "Change the language used by the application. Restart is required."
+    "message": "การเปลี่ยนภาษาของแอพพลิเคชั่น จำเป็นต้องรีสตาร์ท"
  },
  "theme": {
-    "message": "Theme"
+    "message": "ธีม"
  },
  "themeDesc": {
    "message": "Change the application's color theme."
  },
  "dark": {
-    "message": "Dark",
+    "message": "มืด",
    "description": "Dark color"
  },
  "light": {
-    "message": "Light",
+    "message": "สว่าง",
    "description": "Light color"
  },
  "copy": {
@@ -1015,7 +1015,7 @@
    "message": "Update Available"
  },
  "updateAvailableDesc": {
-    "message": "An update was found. Do you want to download it now?"
+    "message": "ตรวจพบการอัปเดต คุณต้องการดาวโหลดตอนนี้เลยไหม?"
  },
  "restart": {
    "message": "เริ่มต้นใหม่"
@@ -1030,7 +1030,7 @@
    "message": "เกิดข้อผิดพลาดในการอัปเดต"
  },
  "unknown": {
-    "message": "Unknown"
+    "message": "ไม่ทราบ"
  },
  "copyUsername": {
    "message": "คัดลอกชื่อผู้ใช้"
@@ -1056,10 +1056,10 @@
    "message": "Refresh Membership"
  },
  "premiumNotCurrentMember": {
-    "message": "You are not currently a premium member."
+    "message": "คุณยังไม่ได้เป็นสมาชิกระดับพรีเมียม"
  },
  "premiumSignUpAndGet": {
-    "message": "Sign up for a premium membership and get:"
+    "message": "สมัครสมาชิกพรีเมี่ยมและรับ:"
  },
  "premiumSignUpStorage": {
    "message": "1 GB of encrypted file storage."
@@ -1259,11 +1259,11 @@
    "message": "Hide to Tray"
  },
  "alwaysOnTop": {
-    "message": "Always on Top",
+    "message": "อยู่ด้านบนเสมอ",
    "description": "Application window should always stay on top of other windows"
  },
  "dateUpdated": {
-    "message": "Updated",
+    "message": "อัปเดตแล้ว",
    "description": "ex. Date this item was updated"
  },
  "datePasswordUpdated": {
@@ -1299,10 +1299,10 @@
    "description": "hCaptcha is the name of a website, should not be translated"
  },
  "invalidUrl": {
-    "message": "Invalid Url"
+    "message": "Url ไม่ถูกต้อง"
  },
  "done": {
-    "message": "Done"
+    "message": "เสร็จสิ้น"
  },
  "accessibilityCookieSaved": {
    "message": "Accessibility cookie saved!"
@@ -1311,7 +1311,7 @@
    "message": "No accessibility cookie saved"
  },
  "warning": {
-    "message": "WARNING",
+    "message": "คำเตือน",
    "description": "WARNING (should stay in capitalized letters if the language permits)"
  },
  "confirmVaultExport": {
@@ -1333,21 +1333,21 @@
    "message": "There are no collections to list."
  },
  "ownership": {
-    "message": "Ownership"
+    "message": "ความเป็นเจ้าของ"
  },
  "whoOwnsThisItem": {
-    "message": "Who owns this item?"
+    "message": "ใครเป็นเจ้าของรายการนี้?"
  },
  "strong": {
-    "message": "Strong",
+    "message": "แข็งแรง",
    "description": "ex. A strong password. Scale: Weak -> Good -> Strong"
  },
  "good": {
-    "message": "Good",
+    "message": "ไม่เลว",
    "description": "ex. A good password. Scale: Weak -> Good -> Strong"
  },
  "weak": {
-    "message": "Weak",
+    "message": "ง่ายเกินไป",
    "description": "ex. A weak password. Scale: Weak -> Good -> Strong"
  },
  "weakMasterPassword": {
@@ -1361,19 +1361,19 @@
    "description": "PIN code. Ex. The short code (often numeric) that you use to unlock a device."
  },
  "unlockWithPin": {
-    "message": "Unlock with PIN"
+    "message": "ปลดล็อกด้วย 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."
+    "message": "กรุณาใส่รหัส PIN"
  },
  "invalidPin": {
-    "message": "Invalid PIN code."
+    "message": "PIN ไม่ถูกต้อง"
  },
  "unlockWithWindowsHello": {
-    "message": "Unlock with Windows Hello"
+    "message": "ปลดล็อก ด้วย Windows Hello"
  },
  "windowsHelloConsentMessage": {
    "message": "Verify for Bitwarden."
@@ -1394,7 +1394,7 @@
    "message": "Lock with master password on restart"
  },
  "deleteAccount": {
-    "message": "Delete account"
+    "message": "ลบบัญชีผู้ใช้"
  },
  "deleteAccountDesc": {
    "message": "Proceed below to delete your account and all vault data."
@@ -1403,13 +1403,13 @@
    "message": "Deleting your account is permanent. It cannot be undone."
  },
  "accountDeleted": {
-    "message": "Account deleted"
+    "message": "ลบบัญชีผู้ใช้แล้ว"
  },
  "accountDeletedDesc": {
    "message": "Your account has been closed and all associated data has been deleted."
  },
  "preferences": {
-    "message": "Preferences"
+    "message": "การตั้งค่า"
  },
  "enableMenuBar": {
    "message": "Show menu bar icon"
@@ -1437,7 +1437,7 @@
    "description": "Noun. As in 'legal documents', like our terms of service and privacy policy."
  },
  "termsOfService": {
-    "message": "Terms of Service"
+    "message": "เงื่อนไขการใช้บริการ"
  },
  "privacyPolicy": {
    "message": "Privacy Policy"
@@ -1505,7 +1505,7 @@
    "message": "Enterprise Single Sign-On"
  },
  "setMasterPassword": {
-    "message": "Set Master Password"
+    "message": "ตั้งรหัสผ่านหลัก"
  },
  "ssoCompleteRegistration": {
    "message": "In order to complete logging in with SSO, please set a master password to access and protect your vault."
@@ -1514,7 +1514,7 @@
    "message": "New Master Password"
  },
  "confirmNewMasterPass": {
-    "message": "Confirm New Master Password"
+    "message": "ยืนยันรหัสผ่านใหม่"
  },
  "masterPasswordPolicyInEffect": {
    "message": "One or more organization policies require your master password to meet the following requirements:"
@@ -1589,7 +1589,7 @@
    "message": "Add an additional layer of security by requiring fingerprint phrase confirmation when establishing a link between your desktop and browser. This requires user action and verification each time a connection is created."
  },
  "approve": {
-    "message": "Approve"
+    "message": "อนุมัติ"
  },
  "verifyBrowserTitle": {
    "message": "Verify browser connection"
@@ -1613,14 +1613,14 @@
    "message": "An organization policy is affecting your ownership options."
  },
  "allSends": {
-    "message": "All Sends",
+    "message": "ส่งทั้งหมด",
    "description": "'Sends' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
  },
  "sendTypeFile": {
-    "message": "File"
+    "message": "ไฟล์"
  },
  "sendTypeText": {
-    "message": "Text"
+    "message": "ข้อความ"
  },
  "searchSends": {
    "message": "Search Sends",
@@ -1631,13 +1631,13 @@
    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
  },
  "myVault": {
-    "message": "My Vault"
+    "message": "ตู้เซฟของฉัน"
  },
  "text": {
-    "message": "Text"
+    "message": "ข้อความ"
  },
  "deletionDate": {
-    "message": "Deletion Date"
+    "message": "ถูกลบเมื่อวันที่"
  },
  "deletionDateDesc": {
    "message": "The Send will be permanently deleted on the specified date and time.",
@@ -1674,7 +1674,7 @@
    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
  },
  "sendLink": {
-    "message": "Send link",
+    "message": "ส่งลิงก์",
    "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
  },
  "sendLinkLabel": {
@@ -1715,7 +1715,7 @@
    "message": "The file you want to send."
  },
  "days": {
-    "message": "$DAYS$ days",
+    "message": "$DAYS$ วัน",
    "placeholders": {
      "days": {
        "content": "$1",
--- a/apps/desktop/src/locales/uk/messages.json
+++ b/apps/desktop/src/locales/uk/messages.json
@@ -61,7 +61,7 @@
    }
  },
  "moveToOrgDesc": {
-    "message": "Виберіть організацію, до якої ви бажаєте перемістити цей запис. При переміщенні до організації власність запису передається тій організації. Ви більше не будете єдиним власником цього запису після переміщення."
+    "message": "Виберіть організацію, до якої ви бажаєте перемістити цей запис. Переміщуючи до організації, власність запису передається тій організації. Ви більше не будете єдиним власником цього запису після переміщення."
  },
  "attachments": {
    "message": "Вкладення"
--- a/apps/desktop/src/main.ts
+++ b/apps/desktop/src/main.ts
@@ -104,7 +104,7 @@ export class Main {
    this.updaterMain = new UpdaterMain(
      this.i18nService,
      this.windowMain,
-      "desktop",
+      "clients",
      null,
      null,
      null,
--- a/apps/desktop/src/services/i18n.service.ts
+++ b/apps/desktop/src/services/i18n.service.ts
@@ -34,6 +34,7 @@ export class I18nService extends BaseI18nService {
      "eo",
      "es",
      "et",
+      "eu",
      "fa",
      "fi",
      "fil",
--- a/apps/web/README.md
+++ b/apps/web/README.md
@@ -5,8 +5,8 @@
    The Bitwarden web project is an Angular application that powers the web vault (https://vault.bitwarden.com/).
 </p>
 <p align="center">
-  <a href="https://github.com/bitwarden/web/actions?query=branch:master" target="_blank">
-    <img src="https://github.com/bitwarden/web/actions/workflows/build.yml/badge.svg?branch=master" alt="Github Workflow build on master" />
+  <a href="https://github.com/bitwarden/clients/actions/workflows/build-web.yml?query=branch:master" target="_blank">
+    <img src="https://github.com/bitwarden/clients/actions/workflows/build-web.yml/badge.svg?branch=master" alt="Github Workflow build on master" />
  </a>
  <a href="https://crowdin.com/project/bitwarden-web" target="_blank">
    <img src="https://d322cqt584bo4o.cloudfront.net/bitwarden-web/localized.svg" alt="Crowdin" />
--- a/apps/web/src/app/accounts/accept-organization.component.ts
+++ b/apps/web/src/app/accounts/accept-organization.component.ts
@@ -5,6 +5,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
+import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction";
 import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
@@ -34,7 +35,8 @@ export class AcceptOrganizationComponent extends BaseAcceptComponent {
    private cryptoService: CryptoService,
    private policyApiService: PolicyApiServiceAbstraction,
    private policyService: PolicyService,
-    private logService: LogService
+    private logService: LogService,
+    private organizationApiService: OrganizationApiServiceAbstraction
  ) {
    super(router, platformUtilsService, i18nService, route, stateService);
  }
@@ -74,7 +76,7 @@ export class AcceptOrganizationComponent extends BaseAcceptComponent {
    request.token = qParams.token;

    if (await this.performResetPasswordAutoEnroll(qParams)) {
-      const response = await this.apiService.getOrganizationKeys(qParams.organizationId);
+      const response = await this.organizationApiService.getKeys(qParams.organizationId);

      if (response == null) {
        throw new Error(this.i18nService.t("resetPasswordOrgKeysError"));
@@ -92,7 +94,7 @@ export class AcceptOrganizationComponent extends BaseAcceptComponent {
    return request;
  }

-  private async performResetPasswordAutoEnroll(qParams: any): Promise<boolean> {
+  private async performResetPasswordAutoEnroll(qParams: Params): Promise<boolean> {
    let policyList: Policy[] = null;
    try {
      const policies = await this.policyApiService.getPoliciesByToken(
--- a/Show More
+++ b/Show More