diff --git a/src/app/accounts/accept-organization.component.html b/src/app/accounts/accept-organization.component.html index ddcf4d062b..6130bd2d04 100644 --- a/src/app/accounts/accept-organization.component.html +++ b/src/app/accounts/accept-organization.component.html @@ -22,7 +22,8 @@ {{'logIn' | i18n}} - + {{'createAccount' | i18n}} diff --git a/src/app/accounts/hint.component.html b/src/app/accounts/hint.component.html index 8ed479b4f9..ca960438a4 100644 --- a/src/app/accounts/hint.component.html +++ b/src/app/accounts/hint.component.html @@ -6,8 +6,8 @@
- + {{'enterEmailToGetHint' | i18n}}
diff --git a/src/app/accounts/lock.component.html b/src/app/accounts/lock.component.html index e3cea7f6cd..bb6dc0c26e 100644 --- a/src/app/accounts/lock.component.html +++ b/src/app/accounts/lock.component.html @@ -10,10 +10,13 @@
- -
{{'loggedInAsEmail' | i18n : email}} diff --git a/src/app/accounts/login.component.html b/src/app/accounts/login.component.html index 9c68fd5714..96843523db 100644 --- a/src/app/accounts/login.component.html +++ b/src/app/accounts/login.component.html @@ -7,15 +7,19 @@
- +
- -
@@ -23,7 +27,8 @@
- +
@@ -34,7 +39,8 @@ - + {{'createAccount' | i18n}}
diff --git a/src/app/accounts/recover-delete.component.html b/src/app/accounts/recover-delete.component.html index 829483c8d3..4675769ed6 100644 --- a/src/app/accounts/recover-delete.component.html +++ b/src/app/accounts/recover-delete.component.html @@ -7,8 +7,8 @@

{{'deleteRecoverDesc' | i18n}}

- +
diff --git a/src/app/accounts/recover-two-factor.component.html b/src/app/accounts/recover-two-factor.component.html index 9f2d2e38bb..d0f186ddc2 100644 --- a/src/app/accounts/recover-two-factor.component.html +++ b/src/app/accounts/recover-two-factor.component.html @@ -5,22 +5,23 @@

{{'recoverAccountTwoStepDesc' | i18n}} - {{'learnMore' | i18n}} + {{'learnMore' | i18n}}

- +
- +
- +
diff --git a/src/app/accounts/register.component.html b/src/app/accounts/register.component.html index bdc0028005..b184b94aa5 100644 --- a/src/app/accounts/register.component.html +++ b/src/app/accounts/register.component.html @@ -4,31 +4,38 @@

{{'createAccount' | i18n}}

- + {{'createOrganizationCreatePersonalAccount' | i18n}}
- + {{'emailAddressDesc' | i18n}}
- + {{'yourNameDesc' | i18n}}
- - + + +
-
@@ -38,10 +45,13 @@
- -
@@ -62,8 +72,10 @@
{{'submitAgreePolicies' | i18n}} - {{'termsOfService' | i18n}}, - {{'privacyPolicy' | i18n}} + {{'termsOfService' | i18n}}, + {{'privacyPolicy' | i18n}}
diff --git a/src/app/accounts/two-factor-options.component.html b/src/app/accounts/two-factor-options.component.html index 3635d43345..4e291461d9 100644 --- a/src/app/accounts/two-factor-options.component.html +++ b/src/app/accounts/two-factor-options.component.html @@ -8,7 +8,8 @@
- +

{{p.name}}

{{p.description}} diff --git a/src/app/accounts/two-factor.component.html b/src/app/accounts/two-factor.component.html index a12b470a87..b331af8b5f 100644 --- a/src/app/accounts/two-factor.component.html +++ b/src/app/accounts/two-factor.component.html @@ -1,19 +1,24 @@
-
+

{{title}}

- -

{{'enterVerificationCodeApp' | i18n}}

+ +

+ {{'enterVerificationCodeApp' | i18n}}

{{'enterVerificationCodeEmail' | i18n : twoFactorEmail}}

- + - + {{'sendVerificationCodeEmailAgain' | i18n}} @@ -24,8 +29,8 @@
- +
@@ -43,9 +48,11 @@
- +
- +
@@ -54,7 +61,8 @@
- - +
-
diff --git a/src/app/organizations/manage/collections.component.html b/src/app/organizations/manage/collections.component.html index 62711646e0..bf6e919d84 100644 --- a/src/app/organizations/manage/collections.component.html +++ b/src/app/organizations/manage/collections.component.html @@ -3,7 +3,8 @@
- +
diff --git a/src/app/organizations/manage/entity-events.component.html b/src/app/organizations/manage/entity-events.component.html index 3a8008fe1f..5333260968 100644 --- a/src/app/organizations/manage/entity-events.component.html +++ b/src/app/organizations/manage/entity-events.component.html @@ -17,14 +17,15 @@
- + - - +
- diff --git a/src/app/organizations/manage/entity-users.component.html b/src/app/organizations/manage/entity-users.component.html index 5bd3ad6805..d5230c1e85 100644 --- a/src/app/organizations/manage/entity-users.component.html +++ b/src/app/organizations/manage/entity-users.component.html @@ -13,12 +13,13 @@
-
+
- +
@@ -44,8 +44,8 @@ - diff --git a/src/app/organizations/manage/group-add-edit.component.html b/src/app/organizations/manage/group-add-edit.component.html index d01b0a8320..d7537d524e 100644 --- a/src/app/organizations/manage/group-add-edit.component.html +++ b/src/app/organizations/manage/group-add-edit.component.html @@ -35,13 +35,15 @@
- +
- + @@ -62,13 +64,15 @@ - + {{c.name}} - + @@ -80,12 +84,15 @@ {{'save' | i18n}} - +
-
diff --git a/src/app/organizations/manage/groups.component.html b/src/app/organizations/manage/groups.component.html index c246012a2a..50e154d76b 100644 --- a/src/app/organizations/manage/groups.component.html +++ b/src/app/organizations/manage/groups.component.html @@ -3,7 +3,8 @@
- +
diff --git a/src/app/organizations/manage/manage.component.html b/src/app/organizations/manage/manage.component.html index 7ec0c63492..e5292c607a 100644 --- a/src/app/organizations/manage/manage.component.html +++ b/src/app/organizations/manage/manage.component.html @@ -4,16 +4,19 @@
{{'manage' | i18n}}
- + {{'people' | i18n}} {{'collections' | i18n}} - + {{'groups' | i18n}} - + {{'eventLogs' | i18n}}
diff --git a/src/app/organizations/manage/people.component.html b/src/app/organizations/manage/people.component.html index 6dd623ea3d..4d8737f4e7 100644 --- a/src/app/organizations/manage/people.component.html +++ b/src/app/organizations/manage/people.component.html @@ -2,15 +2,18 @@

{{'people' | i18n}}

- - -
- +
- + {{'resendInvitation' | i18n}} - + {{'confirm' | i18n}} @@ -72,7 +82,8 @@ {{'groups' | i18n}} - + {{'eventLogs' | i18n}} diff --git a/src/app/organizations/manage/user-add-edit.component.html b/src/app/organizations/manage/user-add-edit.component.html index 4966f3912d..7510183be5 100644 --- a/src/app/organizations/manage/user-add-edit.component.html +++ b/src/app/organizations/manage/user-add-edit.component.html @@ -24,28 +24,32 @@

{{'userType' | i18n}}

- +
- +
- +
- +
diff --git a/src/app/organizations/settings/account.component.html b/src/app/organizations/settings/account.component.html index 504cd60e86..22680d8075 100644 --- a/src/app/organizations/settings/account.component.html +++ b/src/app/organizations/settings/account.component.html @@ -13,11 +13,13 @@
- +
- +
@@ -42,7 +44,8 @@

{{'dangerZoneDesc' | i18n}}

- +
diff --git a/src/app/organizations/settings/adjust-seats.component.html b/src/app/organizations/settings/adjust-seats.component.html index d79e46cc7e..e85aa8061b 100644 --- a/src/app/organizations/settings/adjust-seats.component.html +++ b/src/app/organizations/settings/adjust-seats.component.html @@ -4,8 +4,8 @@
- +
diff --git a/src/app/organizations/settings/delete-organization.component.html b/src/app/organizations/settings/delete-organization.component.html index 428ac54425..176934c16f 100644 --- a/src/app/organizations/settings/delete-organization.component.html +++ b/src/app/organizations/settings/delete-organization.component.html @@ -11,8 +11,8 @@

{{'deleteOrganizationDesc' | i18n}}

{{'deleteOrganizationWarning' | i18n}} - +
- {{'subscriptionCanceled' | i18n}} + + {{'subscriptionCanceled' | i18n}}

{{'subscriptionPendingCanceled' | i18n}}

- @@ -39,7 +40,8 @@
{{'status' | i18n}}
{{subscription.status || '-'}} - {{'pendingCancellation' | i18n}} + {{'pendingCancellation' | i18n}}
{{'nextCharge' | i18n}}
{{nextInvoice ? ((nextInvoice.date | date: 'mediumDate') + ', ' + (nextInvoice.amount | currency:'$')) @@ -76,7 +78,8 @@

{{'updateLicense' | i18n}}

- +
@@ -85,13 +88,15 @@ - - @@ -108,15 +113,17 @@ {{'removeSeats' | i18n}}
- +

{{'storage' | i18n}}

{{'subscriptionStorage' | i18n : sub.maxStorageGb || 0 : sub.storageName || '0 MB'}}

-
{{(storagePercentage / 100) | percent}}
+
+ {{(storagePercentage / 100) | percent}}
@@ -128,8 +135,9 @@ {{'removeStorage' | i18n}}
- +
diff --git a/src/app/organizations/tools/tools.component.html b/src/app/organizations/tools/tools.component.html index 76ae734dbd..0ffb712568 100644 --- a/src/app/organizations/tools/tools.component.html +++ b/src/app/organizations/tools/tools.component.html @@ -16,7 +16,8 @@
{{'reports' | i18n}}
- + {{'upgrade' | i18n}}
diff --git a/src/app/organizations/vault/vault.component.html b/src/app/organizations/vault/vault.component.html index ecc138fbf4..e36dca17a8 100644 --- a/src/app/organizations/vault/vault.component.html +++ b/src/app/organizations/vault/vault.component.html @@ -1,7 +1,8 @@
-
@@ -10,14 +11,16 @@

{{'vault' | i18n}} - +

-
diff --git a/src/app/settings/account.component.html b/src/app/settings/account.component.html index 7d3a702865..38348e09c7 100644 --- a/src/app/settings/account.component.html +++ b/src/app/settings/account.component.html @@ -20,9 +20,11 @@

{{'dangerZoneDesc' | i18n}}

- + - +
diff --git a/src/app/settings/add-credit.component.html b/src/app/settings/add-credit.component.html index 8f86c21a57..12bdee358c 100644 --- a/src/app/settings/add-credit.component.html +++ b/src/app/settings/add-credit.component.html @@ -3,7 +3,8 @@

{{'addCredit' | i18n}}

- +
@@ -21,8 +22,8 @@
$USD
- +
diff --git a/src/app/settings/adjust-storage.component.html b/src/app/settings/adjust-storage.component.html index 737cf80496..5885a62071 100644 --- a/src/app/settings/adjust-storage.component.html +++ b/src/app/settings/adjust-storage.component.html @@ -4,12 +4,13 @@
- +
- {{'total' | i18n}}: {{storageAdjustment || 0}} GB × {{storageGbPrice | currency:'$'}} = {{adjustedStorageTotal + {{'total' | i18n}}: {{storageAdjustment || 0}} GB × {{storageGbPrice | currency:'$'}} + = {{adjustedStorageTotal | currency:'$'}} /{{interval | i18n}}
@@ -21,7 +21,8 @@
- +
diff --git a/src/app/settings/change-kdf.component.html b/src/app/settings/change-kdf.component.html index 6544d4250e..402f9b1ff4 100644 --- a/src/app/settings/change-kdf.component.html +++ b/src/app/settings/change-kdf.component.html @@ -4,8 +4,8 @@
- +
@@ -13,7 +13,8 @@
- + +
diff --git a/src/app/settings/change-password.component.html b/src/app/settings/change-password.component.html index 230ec97b23..cb3cfdcf86 100644 --- a/src/app/settings/change-password.component.html +++ b/src/app/settings/change-password.component.html @@ -22,15 +22,16 @@
- +
- + diff --git a/src/app/settings/create-organization.component.html b/src/app/settings/create-organization.component.html index 8f36326292..7b808d6a40 100644 --- a/src/app/settings/create-organization.component.html +++ b/src/app/settings/create-organization.component.html @@ -8,7 +8,8 @@
- {{'licenseFileDesc' | i18n : 'bitwarden_organization_license.json'}} + {{'licenseFileDesc' | i18n : 'bitwarden_organization_license.json'}}
- +
- +
@@ -40,7 +43,8 @@

{{'chooseYourPlan' | i18n}}

- +
- +
- +
- +
diff --git a/src/app/settings/two-factor-setup.component.html b/src/app/settings/two-factor-setup.component.html index 36ddd8853d..2ea0eb830c 100644 --- a/src/app/settings/two-factor-setup.component.html +++ b/src/app/settings/two-factor-setup.component.html @@ -5,7 +5,8 @@

{{'twoStepLoginOrganizationDesc' | i18n}}

{{'twoStepLoginRecoveryWarning' | i18n}}

- +

{{'providers' | i18n}} @@ -21,15 +22,18 @@

{{p.name}} - - + + {{'premium' | i18n}}

{{p.description}}
-
diff --git a/src/app/settings/two-factor-u2f.component.html b/src/app/settings/two-factor-u2f.component.html index 0ca7f04bf1..1dca7210e8 100644 --- a/src/app/settings/two-factor-u2f.component.html +++ b/src/app/settings/two-factor-u2f.component.html @@ -10,7 +10,8 @@

- +
@@ -29,10 +30,13 @@ {{'u2fkeyX' | i18n : i + 1}} {{k.name}} - + - + - {{'remove' | i18n}} @@ -49,11 +53,13 @@
- +
- @@ -79,12 +85,14 @@ {{'save' | i18n}} - - +
diff --git a/src/app/settings/two-factor-verify.component.html b/src/app/settings/two-factor-verify.component.html index 43434cb94c..2182b5fc40 100644 --- a/src/app/settings/two-factor-verify.component.html +++ b/src/app/settings/two-factor-verify.component.html @@ -2,8 +2,8 @@

{{'twoStepLoginAuthDesc' | i18n}}

- +
- + -
+
{{'twoStepLoginProviderEnabled' | i18n}} @@ -36,11 +38,12 @@
- +
{{k.existingKey}} -
@@ -58,12 +61,14 @@ {{'save' | i18n}} - - +
diff --git a/src/app/settings/update-key.component.html b/src/app/settings/update-key.component.html index 45121be6f7..2071ee588d 100644 --- a/src/app/settings/update-key.component.html +++ b/src/app/settings/update-key.component.html @@ -9,12 +9,13 @@

{{'updateEncryptionKeyShortDesc' | i18n}} {{'updateEncryptionKeyDesc' | i18n}} - {{'learnMore' | i18n}} + {{'learnMore' | i18n}}

{{'updateEncryptionKeyWarning' | i18n}} - +
- +

{{'paymentMethod' | i18n}}

{{'noPaymentMethod' | i18n}}

@@ -57,8 +57,9 @@ - +

{{'invoices' | i18n}}

{{'noInvoices' | i18n}}

@@ -67,7 +68,8 @@ {{i.date | date:'mediumDate'}} - + {{'invoiceNumber' | i18n : i.number}} diff --git a/src/app/settings/user-subscription.component.html b/src/app/settings/user-subscription.component.html index 54bcbf270f..f864acbaee 100644 --- a/src/app/settings/user-subscription.component.html +++ b/src/app/settings/user-subscription.component.html @@ -8,11 +8,12 @@
- {{'subscriptionCanceled' | i18n}} + + {{'subscriptionCanceled' | i18n}}

{{'subscriptionPendingCanceled' | i18n}}

- @@ -28,7 +29,8 @@
{{'status' | i18n}}
{{(subscription && subscription.status) || '-'}} - {{'pendingCancellation' | i18n}} + {{'pendingCancellation' | i18n}}
{{'nextCharge' | i18n}}
{{nextInvoice ? ((nextInvoice.date | date: 'mediumDate') + ', ' + (nextInvoice.amount | currency:'$')) : @@ -57,24 +59,28 @@ - + {{'manageSubscription' | i18n}}

{{'updateLicense' | i18n}}

- + +
- - @@ -82,8 +88,9 @@

{{'storage' | i18n}}

{{'subscriptionStorage' | i18n : sub.maxStorageGb || 0 : sub.storageName || '0 MB'}}

-
{{(storagePercentage / 100) | percent}}
+
+ {{(storagePercentage / 100) | percent}}
@@ -95,8 +102,8 @@ {{'removeStorage' | i18n}}
- +
diff --git a/src/app/settings/verify-email.component.html b/src/app/settings/verify-email.component.html index c98ce80c3d..aed899fa57 100644 --- a/src/app/settings/verify-email.component.html +++ b/src/app/settings/verify-email.component.html @@ -4,8 +4,8 @@

{{'verifyEmailDesc' | i18n}}

-
- +
- +
- +
@@ -31,7 +32,8 @@
- +
@@ -46,23 +48,28 @@
- +
- +
- +
- +
- +
@@ -77,7 +84,8 @@
-
diff --git a/src/app/tools/reused-passwords-report.component.html b/src/app/tools/reused-passwords-report.component.html index 6d869d71fe..24594ac4a2 100644 --- a/src/app/tools/reused-passwords-report.component.html +++ b/src/app/tools/reused-passwords-report.component.html @@ -26,7 +26,8 @@ {{c.name}} - +
{{c.subTitle}} diff --git a/src/app/tools/tools.component.html b/src/app/tools/tools.component.html index 1e2cbbe5e3..69c6263efd 100644 --- a/src/app/tools/tools.component.html +++ b/src/app/tools/tools.component.html @@ -19,7 +19,8 @@
{{'reports' | i18n}}
- + {{'premium' | i18n}}
diff --git a/src/app/tools/unsecured-websites-report.component.html b/src/app/tools/unsecured-websites-report.component.html index 8c7eb208d4..99c481d8f7 100644 --- a/src/app/tools/unsecured-websites-report.component.html +++ b/src/app/tools/unsecured-websites-report.component.html @@ -26,7 +26,8 @@ {{c.name}} - +
{{c.subTitle}} diff --git a/src/app/tools/weak-passwords-report.component.html b/src/app/tools/weak-passwords-report.component.html index a1d979eedb..e59d6b86be 100644 --- a/src/app/tools/weak-passwords-report.component.html +++ b/src/app/tools/weak-passwords-report.component.html @@ -26,7 +26,8 @@ {{c.name}} - +
{{c.subTitle}} diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html index 17eb164429..d3b42972d1 100644 --- a/src/app/vault/add-edit.component.html +++ b/src/app/vault/add-edit.component.html @@ -1,6 +1,7 @@
-
+

{{title}}

@@ -47,25 +51,33 @@
- + - - - + + +
-
- -
@@ -75,15 +87,20 @@
- +
@@ -92,31 +109,38 @@ {{totpSec}} - + - {{totpCodeFormatted}} -
-
+
- +
- - @@ -128,15 +152,19 @@ - +
- + -
@@ -152,11 +180,13 @@
- +
-
@@ -165,10 +195,12 @@
- +
-
@@ -176,28 +208,33 @@
-
- +
- +
- -
@@ -210,7 +247,8 @@
-
@@ -218,93 +256,109 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +

{{'customFields' | i18n}}

@@ -312,43 +366,54 @@
- +
- +
- +
-
- +
- -
- +
-
@@ -371,8 +436,8 @@
-
@@ -385,7 +450,8 @@
- +
@@ -424,13 +490,16 @@ {{'cancel' | i18n}}
- -
diff --git a/src/app/vault/attachments.component.html b/src/app/vault/attachments.component.html index 693d223114..a785a9e5cb 100644 --- a/src/app/vault/attachments.component.html +++ b/src/app/vault/attachments.component.html @@ -24,7 +24,8 @@
- + @@ -33,10 +34,12 @@ {{a.sizeName}} - diff --git a/src/app/vault/bulk-delete.component.html b/src/app/vault/bulk-delete.component.html index 439edf0617..8d19e57fce 100644 --- a/src/app/vault/bulk-delete.component.html +++ b/src/app/vault/bulk-delete.component.html @@ -17,7 +17,8 @@ {{'delete' | i18n}} - +
diff --git a/src/app/vault/bulk-move.component.html b/src/app/vault/bulk-move.component.html index 328e8855a3..8311353a18 100644 --- a/src/app/vault/bulk-move.component.html +++ b/src/app/vault/bulk-move.component.html @@ -23,7 +23,8 @@ {{'save' | i18n}} - +
diff --git a/src/app/vault/bulk-share.component.html b/src/app/vault/bulk-share.component.html index 97079767f0..78b779de2b 100644 --- a/src/app/vault/bulk-share.component.html +++ b/src/app/vault/bulk-share.component.html @@ -11,10 +11,12 @@

{{'shareManyDesc' | i18n}}

-

{{'shareSelectedItemsCountDesc' | i18n: this.ciphers.length : shareableCiphers.length : nonShareableCount}}

+

{{'shareSelectedItemsCountDesc' | i18n: this.ciphers.length : shareableCiphers.length : nonShareableCount}} +

-
@@ -36,7 +38,8 @@ - + {{c.name}} @@ -46,11 +49,13 @@
- - +
diff --git a/src/app/vault/ciphers.component.html b/src/app/vault/ciphers.component.html index 34dbac67c4..599ad6d23f 100644 --- a/src/app/vault/ciphers.component.html +++ b/src/app/vault/ciphers.component.html @@ -9,10 +9,12 @@ - {{c.name}} - + {{c.name}} + - + @@ -21,12 +23,13 @@
-
- + {{'copyPassword' | i18n}} @@ -34,15 +37,18 @@ {{'attachments' | i18n}} - + {{'share' | i18n}} - + {{'collections' | i18n}} - + {{'eventLogs' | i18n}} diff --git a/src/app/vault/collections.component.html b/src/app/vault/collections.component.html index f381f738bd..b74663a192 100644 --- a/src/app/vault/collections.component.html +++ b/src/app/vault/collections.component.html @@ -30,7 +30,8 @@ - + {{c.name}} @@ -44,7 +45,8 @@ {{'save' | i18n}} - +
diff --git a/src/app/vault/folder-add-edit.component.html b/src/app/vault/folder-add-edit.component.html index acc6060ec9..0674a5e5a0 100644 --- a/src/app/vault/folder-add-edit.component.html +++ b/src/app/vault/folder-add-edit.component.html @@ -16,12 +16,15 @@ {{'save' | i18n}} - +
-
diff --git a/src/app/vault/groupings.component.html b/src/app/vault/groupings.component.html index 5bc7a142ab..d9b44b51b7 100644 --- a/src/app/vault/groupings.component.html +++ b/src/app/vault/groupings.component.html @@ -1,13 +1,14 @@
{{'filters' | i18n}} - +
- +
  • @@ -50,27 +51,33 @@

    {{'folders' | i18n}} - +

    @@ -78,14 +85,19 @@ diff --git a/src/app/vault/share.component.html b/src/app/vault/share.component.html index f45e26377c..522f525f29 100644 --- a/src/app/vault/share.component.html +++ b/src/app/vault/share.component.html @@ -17,7 +17,8 @@

    {{'shareDesc' | i18n}}

    -
    @@ -39,7 +40,8 @@ - + {{c.name}} @@ -49,14 +51,17 @@
- - + {{'newOrganization' | i18n}} - +
diff --git a/src/app/vault/vault.component.html b/src/app/vault/vault.component.html index 669af1f687..568e57ad87 100644 --- a/src/app/vault/vault.component.html +++ b/src/app/vault/vault.component.html @@ -1,8 +1,9 @@
-
@@ -11,13 +12,14 @@

{{'myVault' | i18n}} - +

-
@@ -49,7 +51,8 @@
-
@@ -72,7 +75,8 @@

{{'updateBrowserDesc' | i18n}}

- + {{'updateBrowser' | i18n}}
@@ -91,7 +95,8 @@
{{'organizations' | i18n}} - +