diff --git a/jslib b/jslib index 78ae9383fb..18bf616e2e 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 78ae9383fbc1035bd27c022756cfa1f510ae16c9 +Subproject commit 18bf616e2e0821a46b1cb71737d80b099a64b237 diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json index 3f949d3e67..e42b3f0817 100644 --- a/src/_locales/en/messages.json +++ b/src/_locales/en/messages.json @@ -150,6 +150,9 @@ "save": { "message": "Save" }, + "move": { + "message": "Move" + }, "addFolder": { "message": "Add Folder" }, @@ -628,23 +631,33 @@ "shared": { "message": "Shared" }, - "shareVault": { - "message": "Share Your Vault" + "learnOrg": { + "message": "Learn about Organizations" }, - "shareVaultConfirmation": { - "message": "Bitwarden allows you to share your vault with others by using an organization account. Would you like to visit the bitwarden.com website to learn more?" + "learnOrgConfirmation": { + "message": "Bitwarden allows you to share your vault items with others by using an organization. Would you like to visit the bitwarden.com website to learn more?" }, - "shareItem": { - "message": "Share Item" + "moveToOrganization": { + "message": "Move to Organization" }, "share": { "message": "Share" }, - "sharedItem": { - "message": "Shared Item" + "movedItemToOrg": { + "message": "$ITEMNAME$ moved to $ORGNAME$", + "placeholders": { + "itemname": { + "content": "$1", + "example": "Secret Item" + }, + "orgname": { + "content": "$2", + "example": "Company Name" + } + } }, - "shareDesc": { - "message": "Choose an organization that you wish to share this item with. Sharing transfers ownership of the item to the organization. You will no longer be the direct owner of this item once it has been shared." + "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." }, "learnMore": { "message": "Learn more" diff --git a/src/popup/components/cipher-row.component.html b/src/popup/components/cipher-row.component.html index 19a9e87d7d..b30cb3aead 100644 --- a/src/popup/components/cipher-row.component.html +++ b/src/popup/components/cipher-row.component.html @@ -6,7 +6,7 @@ {{cipher.name}} - + {{'shared' | i18n}} diff --git a/src/popup/settings/settings.component.html b/src/popup/settings/settings.component.html index ba69adeddd..dca4e80134 100644 --- a/src/popup/settings/settings.component.html +++ b/src/popup/settings/settings.component.html @@ -102,11 +102,6 @@
{{'exportVault' | i18n}}
- -
{{'shareVault' | i18n}}
- -
{{'bitWebVault' | i18n}}
@@ -126,6 +121,11 @@
{{'about' | i18n}}
+ +
{{'learnOrg' | i18n}}
+ +
{{'helpFeedback' | i18n}}
diff --git a/src/popup/settings/settings.component.ts b/src/popup/settings/settings.component.ts index c6d7c88b09..87315280aa 100644 --- a/src/popup/settings/settings.component.ts +++ b/src/popup/settings/settings.component.ts @@ -310,7 +310,7 @@ export class SettingsComponent implements OnInit { async share() { const confirmed = await this.platformUtilsService.showDialog( - this.i18nService.t('shareVaultConfirmation'), this.i18nService.t('shareVault'), + this.i18nService.t('learnOrgConfirmation'), this.i18nService.t('learnOrg'), this.i18nService.t('yes'), this.i18nService.t('cancel')); if (confirmed) { BrowserApi.createNewTab('https://help.bitwarden.com/article/what-is-an-organization/'); diff --git a/src/popup/vault/share.component.html b/src/popup/vault/share.component.html index fd45749f86..f6422ae634 100644 --- a/src/popup/vault/share.component.html +++ b/src/popup/vault/share.component.html @@ -4,12 +4,12 @@
- {{'share' | i18n}} + {{'moveToOrganization' | i18n}}
@@ -31,7 +31,7 @@