resolve merge conflicts for a11y changes

.github/CODEOWNERS

@@ -32,6 +32,12 @@ libs/common/src/tools @bitwarden/team-tools-dev
 libs/exporter @bitwarden/team-tools-dev
 libs/importer @bitwarden/team-tools-dev
 
+## Localization/Crowdin (Tools team)
+apps/browser/src/_locales @bitwarden/team-tools-dev
+apps/cli/src/locales @bitwarden/team-tools-dev
+apps/desktop/src/locales @bitwarden/team-tools-dev
+apps/web/src/locales @bitwarden/team-tools-dev
+
 ## Vault team files ##
 apps/browser/src/vault @bitwarden/team-vault-dev
 apps/cli/src/vault @bitwarden/team-vault-dev
@@ -95,6 +101,7 @@ apps/desktop/src/package.json
 /apps/web/config
 /apps/web/package.json
 
+package.json
 package-lock.json
 
 ## Locales ##

.github/renovate.json

@@ -7,11 +7,14 @@
     ":maintainLockFilesWeekly",
     ":pinAllExceptPeerDependencies",
     ":rebaseStalePrs",
-    "schedule:weekends",
-    ":separateMajorReleases"
+    ":separateMajorReleases",
+    "group:monorepos",
+    "schedule:weekends"
   ],
   "prConcurrentLimit": 3,
   "enabledManagers": ["cargo", "github-actions", "npm"],
+  "commitMessagePrefix": "[deps]:",
+  "commitMessageTopic": "{{depName}}",
   "packageRules": [
     {
       "groupName": "cargo minor",
@@ -24,24 +27,242 @@
       "matchUpdateTypes": ["minor", "patch"]
     },
     {
-      "groupName": "npm minor",
-      "matchManagers": ["npm"],
-      "matchUpdateTypes": ["minor", "patch"]
-    },
-    {
-      "matchPackageNames": ["typescript"],
+      "matchPackageNames": ["typescript", "zone.js"],
       "matchUpdateTypes": ["major", "minor"],
+      "description": "Determined by Angular",
       "enabled": false
     },
     {
-      "matchPackageNames": ["typescript"],
+      "matchPackageNames": ["typescript", "zone.js"],
       "matchUpdateTypes": "patch"
     },
     {
       "groupName": "jest",
       "matchPackageNames": ["@types/jest", "jest", "ts-jest", "jest-preset-angular"],
       "matchUpdateTypes": "major"
+    },
+    {
+      "matchPackageNames": [
+        "@ngtools/webpack",
+        "base64-loader",
+        "buffer",
+        "bufferutil",
+        "clean-webpack-plugin",
+        "copy-webpack-plugin",
+        "core-js",
+        "css-loader",
+        "html-loader",
+        "html-webpack-injector",
+        "html-webpack-plugin",
+        "mini-css-extract-plugin",
+        "ngx-infinite-scroll",
+        "postcss",
+        "postcss-loader",
+        "process",
+        "sass",
+        "sass-loader",
+        "style-loader",
+        "ts-loader",
+        "tsconfig-paths-webpack-plugin",
+        "url",
+        "util",
+        "webpack",
+        "webpack-cli",
+        "webpack-dev-server",
+        "webpack-node-externals"
+      ],
+      "description": "Admin Console owned dependencies",
+      "commitMessagePrefix": "[deps] AC:",
+      "reviewers": ["team:team-admin-console-dev"]
+    },
+    {
+      "matchPackageNames": [
+        "@types/duo_web_sdk",
+        "@types/node-ipc",
+        "@types/zxcvbn",
+        "duo_web_sdk",
+        "node-ipc",
+        "qrious",
+        "regedit"
+      ],
+      "description": "Auth owned dependencies",
+      "commitMessagePrefix": "[deps] Auth:",
+      "reviewers": ["team:team-auth-dev"]
+    },
+    {
+      "matchPackageNames": [
+        "concurrently",
+        "cross-env",
+        "del",
+        "gulp",
+        "gulp-filter",
+        "gulp-if",
+        "gulp-json-editor",
+        "gulp-replace",
+        "gulp-zip",
+        "nord",
+        "patch-package",
+        "prettier",
+        "prettier-plugin-tailwindcss",
+        "rimraf",
+        "wait-on"
+      ],
+      "description": "Autofill owned dependencies",
+      "commitMessagePrefix": "[deps] Autofill:",
+      "reviewers": ["team:team-autofill-dev"]
+    },
+    {
+      "matchPackageNames": ["braintree-web-drop-in"],
+      "description": "Billing owned dependencies",
+      "commitMessagePrefix": "[deps] Billing:",
+      "reviewers": ["team:team-billing-dev"]
+    },
+    {
+      "matchPackageNames": [
+        "@angular-devkit/build-angular",
+        "@angular/animations",
+        "@angular/cdk",
+        "@angular/cli",
+        "@angular/common",
+        "@angular/compiler",
+        "@angular/compiler-cli",
+        "@angular/core",
+        "@angular/forms",
+        "@angular/platform",
+        "@angular/compiler",
+        "@angular/router",
+        "@types/argon2-browser",
+        "@types/chrome",
+        "@types/firefox-webext-browser",
+        "@types/jquery",
+        "@types/node",
+        "@types/node-forge",
+        "argon2",
+        "argon2-browser",
+        "big-integer",
+        "bootstrap",
+        "jquery",
+        "node-forge",
+        "popper.js",
+        "rxjs",
+        "type-fest",
+        "typescript",
+        "zone.js"
+      ],
+      "description": "Platform owned dependencies",
+      "commitMessagePrefix": "[deps] Platform:",
+      "reviewers": ["team:team-platform-dev"]
+    },
+    {
+      "matchPackageNames": [
+        "@compodoc/compodoc",
+        "@ng-select/ng-select",
+        "@storybook/addon-a11y",
+        "@storybook/addon-actions",
+        "@storybook/addon-designs",
+        "@storybook/addon-essentials",
+        "@storybook/addon-links",
+        "@storybook/angular",
+        "@types/react",
+        "autoprefixer",
+        "chromatic",
+        "ngx-toastr",
+        "react",
+        "react-dom",
+        "remark-gfm",
+        "storybook",
+        "tailwindcss"
+      ],
+      "description": "Component library owned dependencies",
+      "commitMessagePrefix": "[deps] Platform (CL):",
+      "reviewers": ["team:team-platform-dev"]
+    },
+    {
+      "matchPackageNames": [
+        "@angular-eslint/eslint-plugin",
+        "@angular-eslint/eslint-plugin-template",
+        "@angular-eslint/template-parser",
+        "@types/jest",
+        "@typescript-eslint/eslint-plugin",
+        "@typescript-eslint/parser",
+        "eslint",
+        "eslint-config-prettier",
+        "eslint-import-resolver-typescript",
+        "eslint-plugin-import",
+        "eslint-plugin-rxjs",
+        "eslint-plugin-rxjs-angular",
+        "eslint-plugin-storybook",
+        "eslint-plugin-tailwindcss",
+        "husky",
+        "jest-junit",
+        "jest-mock-extended",
+        "jest-preset-angular",
+        "lint-staged",
+        "ts-jest"
+      ],
+      "description": "Secrets Manager owned dependencies",
+      "commitMessagePrefix": "[deps] SM:",
+      "reviewers": ["team:team-secrets-manager-dev"]
+    },
+    {
+      "matchPackageNames": [
+        "@electron/notarize",
+        "@electron/rebuild",
+        "@microsoft/signalr",
+        "@microsoft/signalr-protocol-msgpack",
+        "@types/papaparse",
+        "electron",
+        "electron-builder",
+        "electron-log",
+        "electron-reload",
+        "electron-store",
+        "electron-updater",
+        "jszip",
+        "papaparse",
+        "tldts",
+        "utf-8-validate"
+      ],
+      "description": "Tools owned dependencies",
+      "commitMessagePrefix": "[deps] Tools:",
+      "reviewers": ["team:team-tools-dev"]
+    },
+    {
+      "matchPackageNames": [
+        "@koa/multer",
+        "@koa/router",
+        "@types/inquirer",
+        "@types/jsdom",
+        "@types/koa",
+        "@types/koa__multer",
+        "@types/koa__router",
+        "@types/koa-bodyparser",
+        "@types/koa-json",
+        "@types/lowdb",
+        "@types/lunr",
+        "@types/node-fetch",
+        "@types/proper-lockfile",
+        "@types/retry",
+        "chalk",
+        "commander",
+        "form-data",
+        "https-proxy-agent",
+        "inquirer",
+        "jsdom",
+        "koa",
+        "koa-bodyparser",
+        "koa-json",
+        "lowdb",
+        "lunr",
+        "multer",
+        "node-fetch",
+        "open",
+        "pkg",
+        "proper-lockfile"
+      ],
+      "description": "Vault owned dependencies",
+      "commitMessagePrefix": "[deps] Vault:",
+      "reviewers": ["team:team-vault-dev"]
     }
   ],
-  "ignoreDeps": ["@types/koa-bodyparser", "bootstrap", "node-ipc", "regedit", "zone.js"]
+  "ignoreDeps": ["@types/koa-bodyparser", "bootstrap", "node-ipc", "node", "npm", "regedit"]
 }

.github/workflows/label-issue-pull-request.yml

@@ -1,5 +1,5 @@
 # Runs creation of Pull Requests
-# If the PR destination branch is master, add a needs-qa label
+# If the PR destination branch is master, add a needs-qa label unless created by renovate[bot]
 ---
 name: Label Issue Pull Request
 
@@ -15,6 +15,7 @@ on:
 jobs:
   add-needs-qa-label:
     runs-on: ubuntu-latest
+    if: ${{ github.actor != 'renovate[bot]' }}
     steps:
       - name: Add label to pull request
         uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 # 1.0.4

apps/browser/src/_locales/ar/messages.json

@@ -2501,6 +2501,9 @@
   "importEncKeyError": {
     "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."
+  },
   "importDestination": {
     "message": "Import destination"
   },
@@ -2610,5 +2613,69 @@
   },
   "useBrowserName": {
     "message": "Use browser"
+  },
+  "multifactorAuthenticationCancelled": {
+    "message": "Multifactor authentication cancelled"
+  },
+  "noLastPassDataFound": {
+    "message": "No LastPass data found"
+  },
+  "incorrectUsernameOrPassword": {
+    "message": "Incorrect username or password"
+  },
+  "multifactorAuthenticationFailed": {
+    "message": "Multifactor authentication failed"
+  },
+  "includeSharedFolders": {
+    "message": "Include shared folders"
+  },
+  "lastPassEmail": {
+    "message": "LastPass Email"
+  },
+  "importingYourAccount": {
+    "message": "Importing your account..."
+  },
+  "lastPassMFARequired": {
+    "message": "LastPass multifactor authentication required"
+  },
+  "lastPassMFADesc": {
+    "message": "Enter your one-time passcode from your authentication app"
+  },
+  "lastPassOOBDesc": {
+    "message": "Approve the login request in your authentication app or enter a one-time passcode."
+  },
+  "passcode": {
+    "message": "Passcode"
+  },
+  "lastPassMasterPassword": {
+    "message": "LastPass master password"
+  },
+  "lastPassAuthRequired": {
+    "message": "LastPass authentication required"
+  },
+  "awaitingSSO": {
+    "message": "Awaiting SSO authentication"
+  },
+  "awaitingSSODesc": {
+    "message": "Please continue to log in using your company credentials."
+  },
+  "seeDetailedInstructions": {
+    "message": "See detailed instructions on our help site at",
+    "description": "This is followed a by a hyperlink to the help website."
+  },
+  "importDirectlyFromLastPass": {
+    "message": "Import directly from LastPass"
+  },
+  "importFromCSV": {
+    "message": "Import from CSV"
+  },
+  "lastPassTryAgainCheckEmail": {
+    "message": "Try again or look for an email from LastPass to verify it's you."
+  },
+  "collection": {
+    "message": "Collection"
+  },
+  "lastPassYubikeyDesc": {
+    "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button."
   }
 }