Skip to content

Commit

Permalink
Merge branch 'main' into auth/pm-3953/generalize-copy-for-login-with-…
Browse files Browse the repository at this point in the history
…device
  • Loading branch information
alec-livefront authored Jan 31, 2025
2 parents babdb06 + 91509f2 commit 42a1ba3
Show file tree
Hide file tree
Showing 212 changed files with 2,596 additions and 1,265 deletions.
14 changes: 7 additions & 7 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,13 @@ apps/desktop/src/services/duckduckgo-message-handler.service.ts @bitwarden/team-
# SSH Agent
apps/desktop/desktop_native/core/src/ssh_agent @bitwarden/team-autofill-dev @bitwarden/wg-ssh-keys

## Component Library ##
.storybook @bitwarden/team-design-system
libs/components @bitwarden/team-design-system
libs/ui @bitwarden/team-design-system
apps/browser/src/platform/popup/layout @bitwarden/team-design-system
apps/browser/src/popup/app-routing.animations.ts @bitwarden/team-design-system
apps/web/src/app/layouts @bitwarden/team-design-system
## UI Foundation ##
.storybook @bitwarden/team-ui-foundation
libs/components @bitwarden/team-ui-foundation
libs/ui @bitwarden/team-ui-foundation
apps/browser/src/platform/popup/layout @bitwarden/team-ui-foundation
apps/browser/src/popup/app-routing.animations.ts @bitwarden/team-ui-foundation
apps/web/src/app/layouts @bitwarden/team-ui-foundation

## Desktop native module ##
apps/desktop/desktop_native @bitwarden/team-platform-dev
Expand Down
6 changes: 3 additions & 3 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,9 @@
"tailwindcss",
"zone.js"
],
"description": "Component library owned dependencies",
"commitMessagePrefix": "[deps] Design System:",
"reviewers": ["team:team-design-system"]
"description": "UI Foundation owned dependencies",
"commitMessagePrefix": "[deps] UI Foundation:",
"reviewers": ["team:team-ui-foundation"]
},
{
"matchPackageNames": [
Expand Down
6 changes: 3 additions & 3 deletions apps/browser/src/_locales/ar/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1280,9 +1280,6 @@
"premiumPurchase": {
"message": "شراء العضوية المميزة"
},
"premiumPurchaseAlert": {
"message": "يمكنك شراء العضوية المتميزة على bitwarden.com على خزانة الويب. هل تريد زيارة الموقع الآن؟"
},
"premiumPurchaseAlertV2": {
"message": "You can purchase Premium from your account settings on the Bitwarden web app."
},
Expand Down Expand Up @@ -2064,6 +2061,9 @@
"usernameGenerator": {
"message": "مولد اسم المستخدم"
},
"useThisEmail": {
"message": "Use this email"
},
"useThisPassword": {
"message": "استخدم كلمة المرور هذه"
},
Expand Down
6 changes: 3 additions & 3 deletions apps/browser/src/_locales/az/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1280,9 +1280,6 @@
"premiumPurchase": {
"message": "Premium satın al"
},
"premiumPurchaseAlert": {
"message": "Premium üzvlüyü bitwarden.com veb seyfində satın ala bilərsiniz. İndi saytı ziyarət etmək istəyirsiniz?"
},
"premiumPurchaseAlertV2": {
"message": "Bitwarden veb tətbiqindəki hesab ayarlarınızda Premium satın ala bilərsiniz."
},
Expand Down Expand Up @@ -2064,6 +2061,9 @@
"usernameGenerator": {
"message": "İstifadəçi adı yaradıcı"
},
"useThisEmail": {
"message": "Bu e-poçtu istifadə et"
},
"useThisPassword": {
"message": "Bu parolu istifadə et"
},
Expand Down
6 changes: 3 additions & 3 deletions apps/browser/src/_locales/be/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1280,9 +1280,6 @@
"premiumPurchase": {
"message": "Купіць прэміум"
},
"premiumPurchaseAlert": {
"message": "Вы можаце купіць прэміяльны статус на bitwarden.com. Перайсці на вэб-сайт зараз?"
},
"premiumPurchaseAlertV2": {
"message": "You can purchase Premium from your account settings on the Bitwarden web app."
},
Expand Down Expand Up @@ -2064,6 +2061,9 @@
"usernameGenerator": {
"message": "Генератар імені карыстальніка"
},
"useThisEmail": {
"message": "Use this email"
},
"useThisPassword": {
"message": "Выкарыстоўваць гэты пароль"
},
Expand Down
6 changes: 3 additions & 3 deletions apps/browser/src/_locales/bg/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1280,9 +1280,6 @@
"premiumPurchase": {
"message": "Покупка на платен абонамент"
},
"premiumPurchaseAlert": {
"message": "Може да платите абонамента си през сайта bitwarden.com. Искате ли да го посетите сега?"
},
"premiumPurchaseAlertV2": {
"message": "Можете да закупите платената версия от настройките на регистрацията си, в приложението по уеб на Битуорден."
},
Expand Down Expand Up @@ -2064,6 +2061,9 @@
"usernameGenerator": {
"message": "Генератор на потребителски имена"
},
"useThisEmail": {
"message": "Използване на тази е-поща"
},
"useThisPassword": {
"message": "Използване на тази парола"
},
Expand Down
6 changes: 3 additions & 3 deletions apps/browser/src/_locales/bn/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1280,9 +1280,6 @@
"premiumPurchase": {
"message": "প্রিমিয়াম কিনুন"
},
"premiumPurchaseAlert": {
"message": "আপনি bitwarden.com ওয়েব ভল্টে প্রিমিয়াম সদস্যতা কিনতে পারেন। আপনি কি এখনই ওয়েবসাইটটি দেখতে চান?"
},
"premiumPurchaseAlertV2": {
"message": "You can purchase Premium from your account settings on the Bitwarden web app."
},
Expand Down Expand Up @@ -2064,6 +2061,9 @@
"usernameGenerator": {
"message": "Username generator"
},
"useThisEmail": {
"message": "Use this email"
},
"useThisPassword": {
"message": "Use this password"
},
Expand Down
6 changes: 3 additions & 3 deletions apps/browser/src/_locales/bs/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1280,9 +1280,6 @@
"premiumPurchase": {
"message": "Purchase Premium"
},
"premiumPurchaseAlert": {
"message": "You can purchase Premium membership on the bitwarden.com web vault. Do you want to visit the website now?"
},
"premiumPurchaseAlertV2": {
"message": "You can purchase Premium from your account settings on the Bitwarden web app."
},
Expand Down Expand Up @@ -2064,6 +2061,9 @@
"usernameGenerator": {
"message": "Username generator"
},
"useThisEmail": {
"message": "Use this email"
},
"useThisPassword": {
"message": "Use this password"
},
Expand Down
Loading

0 comments on commit 42a1ba3

Please sign in to comment.