Skip to content

Commit

Permalink
merge main, fixed conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Jingo88 committed Oct 14, 2024
2 parents c21e5a5 + a884fcf commit 22f2a2f
Show file tree
Hide file tree
Showing 258 changed files with 12,397 additions and 1,398 deletions.
6 changes: 6 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,12 @@
"no-restricted-imports": ["error", { "patterns": ["@bitwarden/send-ui/*", "src/**/*"] }]
}
},
{
"files": ["libs/tools/card/src/**/*.ts"],
"rules": {
"no-restricted-imports": ["error", { "patterns": ["@bitwarden/tools-card/*", "src/**/*"] }]
}
},
{
"files": ["libs/vault/src/**/*.ts"],
"rules": {
Expand Down
1 change: 1 addition & 0 deletions .github/whitelist-capital-letters.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
./libs/tools/README.md
./libs/tools/export/vault-export/README.md
./libs/tools/send/README.md
./libs/tools/card/README.md
./libs/vault/README.md
./README.md
./LICENSE_BITWARDEN.txt
Expand Down
2 changes: 2 additions & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ const config: StorybookConfig = {
"../apps/browser/src/**/*.stories.@(js|jsx|ts|tsx)",
"../bitwarden_license/bit-web/src/**/*.mdx",
"../bitwarden_license/bit-web/src/**/*.stories.@(js|jsx|ts|tsx)",
"../libs/tools/card/src/**/*.mdx",
"../libs/tools/card/src/**/*.stories.@(js|jsx|ts|tsx)",
],
addons: [
getAbsolutePath("@storybook/addon-links"),
Expand Down
25 changes: 23 additions & 2 deletions apps/browser/src/_locales/ar/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@
},
"generator": {
"message": "المولّد",
"description": "Short for 'Password Generator'."
"description": "Short for 'credential generator'."
},
"passGenInfo": {
"message": "قم بإنشاء كلمات مرور قوية وفريدة لتسجيلات الدخول الخاصة بك."
Expand Down Expand Up @@ -2498,7 +2498,25 @@
"message": "Send created successfully!",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendAvailability": {
"sendExpiresInHoursSingle": {
"message": "The Send will be available to anyone with the link for the next 1 hour.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendExpiresInHours": {
"message": "The Send will be available to anyone with the link for the next $HOURS$ hours.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.",
"placeholders": {
"hours": {
"content": "$1",
"example": "5"
}
}
},
"sendExpiresInDaysSingle": {
"message": "The Send will be available to anyone with the link for the next 1 day.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendExpiresInDays": {
"message": "The Send will be available to anyone with the link for the next $DAYS$ days.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.",
"placeholders": {
Expand Down Expand Up @@ -3662,6 +3680,9 @@
"noMatchingLoginsForSite": {
"message": "No matching logins for this site"
},
"searchSavePasskeyNewLogin": {
"message": "Search or save passkey as new login"
},
"confirm": {
"message": "تأكيد"
},
Expand Down
27 changes: 24 additions & 3 deletions apps/browser/src/_locales/az/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@
},
"generator": {
"message": "Yaradıcı",
"description": "Short for 'Password Generator'."
"description": "Short for 'credential generator'."
},
"passGenInfo": {
"message": "Hesablarınız üçün avtomatik olaraq güclü, unikal parollar yaradın."
Expand Down Expand Up @@ -2498,8 +2498,26 @@
"message": "Send uğurla yaradıldı!",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendAvailability": {
"message": "Send, növbəti $DAYS$ ərzində keçidə sahib olan hər kəsə əlçatan olacaq.",
"sendExpiresInHoursSingle": {
"message": "Send, növbəti 1 saat ərzində keçidə sahib olan hər kəsə əlçatan olacaq.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendExpiresInHours": {
"message": "Send, növbəti $HOURS$ saat ərzində keçidə sahib olan hər kəsə əlçatan olacaq.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.",
"placeholders": {
"hours": {
"content": "$1",
"example": "5"
}
}
},
"sendExpiresInDaysSingle": {
"message": "Send, növbəti 1 gün ərzində keçidə sahib olan hər kəsə əlçatan olacaq.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendExpiresInDays": {
"message": "Send, növbəti $DAYS$ gün ərzində keçidə sahib olan hər kəsə əlçatan olacaq.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.",
"placeholders": {
"days": {
Expand Down Expand Up @@ -3662,6 +3680,9 @@
"noMatchingLoginsForSite": {
"message": "Bu sayt üçün uyuşan giriş məlumatı yoxdur"
},
"searchSavePasskeyNewLogin": {
"message": "Axtarın və ya keçid açarını yeni bir giriş olaraq saxlayın"
},
"confirm": {
"message": "Təsdiqlə"
},
Expand Down
25 changes: 23 additions & 2 deletions apps/browser/src/_locales/be/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@
},
"generator": {
"message": "Генератар",
"description": "Short for 'Password Generator'."
"description": "Short for 'credential generator'."
},
"passGenInfo": {
"message": "Аўтаматычна генерыруйце надзейныя і ўнікальныя паролі для вашых лагінаў."
Expand Down Expand Up @@ -2498,7 +2498,25 @@
"message": "Send created successfully!",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendAvailability": {
"sendExpiresInHoursSingle": {
"message": "The Send will be available to anyone with the link for the next 1 hour.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendExpiresInHours": {
"message": "The Send will be available to anyone with the link for the next $HOURS$ hours.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.",
"placeholders": {
"hours": {
"content": "$1",
"example": "5"
}
}
},
"sendExpiresInDaysSingle": {
"message": "The Send will be available to anyone with the link for the next 1 day.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendExpiresInDays": {
"message": "The Send will be available to anyone with the link for the next $DAYS$ days.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.",
"placeholders": {
Expand Down Expand Up @@ -3662,6 +3680,9 @@
"noMatchingLoginsForSite": {
"message": "No matching logins for this site"
},
"searchSavePasskeyNewLogin": {
"message": "Search or save passkey as new login"
},
"confirm": {
"message": "Пацвердзіць"
},
Expand Down
25 changes: 23 additions & 2 deletions apps/browser/src/_locales/bg/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@
},
"generator": {
"message": "Генератор",
"description": "Short for 'Password Generator'."
"description": "Short for 'credential generator'."
},
"passGenInfo": {
"message": "Автоматично създаване на силни и неповторими пароли."
Expand Down Expand Up @@ -2498,7 +2498,25 @@
"message": "Изпращането е създадено успешно!",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendAvailability": {
"sendExpiresInHoursSingle": {
"message": "Изпращането ще бъде достъпно за всеки с връзката през следващия 1 час.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendExpiresInHours": {
"message": "Изпращането ще бъде достъпно за всеки с връзката през следващите $HOURS$ часа.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.",
"placeholders": {
"hours": {
"content": "$1",
"example": "5"
}
}
},
"sendExpiresInDaysSingle": {
"message": "Изпращането ще бъде достъпно за всеки с връзката през следващия 1 ден.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendExpiresInDays": {
"message": "Изпращането ще бъде достъпно за всеки с връзката през следващите $DAYS$ дни.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.",
"placeholders": {
Expand Down Expand Up @@ -3662,6 +3680,9 @@
"noMatchingLoginsForSite": {
"message": "Няма записи за вписване отговарящи на този уеб сайт"
},
"searchSavePasskeyNewLogin": {
"message": "Търсене или запазване на секретния ключ като нов елемент за вписване"
},
"confirm": {
"message": "Потвърждаване"
},
Expand Down
25 changes: 23 additions & 2 deletions apps/browser/src/_locales/bn/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@
},
"generator": {
"message": "উৎপাদক",
"description": "Short for 'Password Generator'."
"description": "Short for 'credential generator'."
},
"passGenInfo": {
"message": "আপনার লগইনগুলির জন্য স্বয়ংক্রিয়ভাবে শক্তিশালী, অদ্বিতীয় পাসওয়ার্ড তৈরি করুন।"
Expand Down Expand Up @@ -2498,7 +2498,25 @@
"message": "Send created successfully!",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendAvailability": {
"sendExpiresInHoursSingle": {
"message": "The Send will be available to anyone with the link for the next 1 hour.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendExpiresInHours": {
"message": "The Send will be available to anyone with the link for the next $HOURS$ hours.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.",
"placeholders": {
"hours": {
"content": "$1",
"example": "5"
}
}
},
"sendExpiresInDaysSingle": {
"message": "The Send will be available to anyone with the link for the next 1 day.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendExpiresInDays": {
"message": "The Send will be available to anyone with the link for the next $DAYS$ days.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.",
"placeholders": {
Expand Down Expand Up @@ -3662,6 +3680,9 @@
"noMatchingLoginsForSite": {
"message": "No matching logins for this site"
},
"searchSavePasskeyNewLogin": {
"message": "Search or save passkey as new login"
},
"confirm": {
"message": "Confirm"
},
Expand Down
25 changes: 23 additions & 2 deletions apps/browser/src/_locales/bs/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@
},
"generator": {
"message": "Generator",
"description": "Short for 'Password Generator'."
"description": "Short for 'credential generator'."
},
"passGenInfo": {
"message": "Automatically generate strong, unique passwords for your logins."
Expand Down Expand Up @@ -2498,7 +2498,25 @@
"message": "Send created successfully!",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendAvailability": {
"sendExpiresInHoursSingle": {
"message": "The Send will be available to anyone with the link for the next 1 hour.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendExpiresInHours": {
"message": "The Send will be available to anyone with the link for the next $HOURS$ hours.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.",
"placeholders": {
"hours": {
"content": "$1",
"example": "5"
}
}
},
"sendExpiresInDaysSingle": {
"message": "The Send will be available to anyone with the link for the next 1 day.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendExpiresInDays": {
"message": "The Send will be available to anyone with the link for the next $DAYS$ days.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.",
"placeholders": {
Expand Down Expand Up @@ -3662,6 +3680,9 @@
"noMatchingLoginsForSite": {
"message": "No matching logins for this site"
},
"searchSavePasskeyNewLogin": {
"message": "Search or save passkey as new login"
},
"confirm": {
"message": "Confirm"
},
Expand Down
25 changes: 23 additions & 2 deletions apps/browser/src/_locales/ca/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@
},
"generator": {
"message": "Generador",
"description": "Short for 'Password Generator'."
"description": "Short for 'credential generator'."
},
"passGenInfo": {
"message": "Genera automàticament contrasenyes fortes i úniques per als vostres inicis de sessió."
Expand Down Expand Up @@ -2498,7 +2498,25 @@
"message": "Send created successfully!",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendAvailability": {
"sendExpiresInHoursSingle": {
"message": "The Send will be available to anyone with the link for the next 1 hour.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendExpiresInHours": {
"message": "The Send will be available to anyone with the link for the next $HOURS$ hours.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.",
"placeholders": {
"hours": {
"content": "$1",
"example": "5"
}
}
},
"sendExpiresInDaysSingle": {
"message": "The Send will be available to anyone with the link for the next 1 day.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendExpiresInDays": {
"message": "The Send will be available to anyone with the link for the next $DAYS$ days.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.",
"placeholders": {
Expand Down Expand Up @@ -3662,6 +3680,9 @@
"noMatchingLoginsForSite": {
"message": "No matching logins for this site"
},
"searchSavePasskeyNewLogin": {
"message": "Search or save passkey as new login"
},
"confirm": {
"message": "Confirma-ho"
},
Expand Down
25 changes: 23 additions & 2 deletions apps/browser/src/_locales/cs/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@
},
"generator": {
"message": "Generátor",
"description": "Short for 'Password Generator'."
"description": "Short for 'credential generator'."
},
"passGenInfo": {
"message": "Vygenerujte si silné a unikátní heslo pro přihlašovací údaje."
Expand Down Expand Up @@ -2498,7 +2498,25 @@
"message": "Send byl úspěšně vytvořen!",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendAvailability": {
"sendExpiresInHoursSingle": {
"message": "Send bude k dispozici na příští 1 hodinu každému, kdo má odkaz.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendExpiresInHours": {
"message": "Send bude k dispozici na příštích $HOURS$ hodin každému, kdo má odkaz.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.",
"placeholders": {
"hours": {
"content": "$1",
"example": "5"
}
}
},
"sendExpiresInDaysSingle": {
"message": "Send bude k dispozici na příští 1 den každému, kdo má odkaz.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"sendExpiresInDays": {
"message": "Send bude k dispozici na příštích $DAYS$ dnů každému, kdo má odkaz.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.",
"placeholders": {
Expand Down Expand Up @@ -3662,6 +3680,9 @@
"noMatchingLoginsForSite": {
"message": "Žádné odpovídající přihlašovací údaje pro tento web"
},
"searchSavePasskeyNewLogin": {
"message": "Vyhledat nebo uložit přístupový klíč jako nové přihlášení"
},
"confirm": {
"message": "Potvrdit"
},
Expand Down
Loading

0 comments on commit 22f2a2f

Please sign in to comment.