Merge branch 'master' of https://github.com/bitwarden/desktop into add-missing-languages

src/app/app.module.ts

@@ -65,6 +65,7 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 
 import { AvatarComponent } from "jslib-angular/components/avatar.component";
 import { CalloutComponent } from "jslib-angular/components/callout.component";
+import { ExportScopeCalloutComponent } from "jslib-angular/components/export-scope-callout.component";
 import { IconComponent } from "jslib-angular/components/icon.component";
 import { BitwardenToastModule } from "jslib-angular/components/toastr.component";
 import { A11yTitleDirective } from "jslib-angular/directives/a11y-title.directive";
@@ -215,6 +216,7 @@ registerLocaleData(localeZhTw, "zh-TW");
     ColorPasswordPipe,
     EnvironmentComponent,
     ExportComponent,
+    ExportScopeCalloutComponent,
     FallbackSrcDirective,
     FolderAddEditComponent,
     GroupingsComponent,

src/app/vault/export.component.html

@@ -9,6 +9,7 @@
         >
           {{ "personalVaultExportPolicyInEffect" | i18n }}
         </app-callout>
+        <app-export-scope-callout *ngIf="!disabledByPolicy"></app-export-scope-callout>
         <div class="box">
           <div class="box-header" id="exportTitle">
             {{ "exportVault" | i18n }}

src/locales/en/messages.json

@@ -736,11 +736,11 @@
   "passwordGenerator": {
     "message": "Password Generator"
   },
-  "emailUs": {
-    "message": "Email Us"
+  "contactUs": {
+    "message": "Contact Us"
   },
-  "visitOurWebsite": {
-    "message": "Visit Our Website"
+  "getHelp": {
+    "message": "Get Help"
   },
   "fileBugReport": {
     "message": "File a Bug Report"
@@ -1816,5 +1816,17 @@
   },
   "sessionTimeout": {
     "message": "Your session has timed out. Please go back and try logging in again."
+  },
+  "exportingPersonalVaultTitle": {
+    "message": "Exporting Personal Vault"
+  },
+  "exportingPersonalVaultDescription": {
+    "message": "Only the personal vault items associated with $EMAIL$ will be exported. Organization vault items will not be included.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
   }
 }

src/main/menu.help.ts

@@ -15,8 +15,8 @@ export class HelpMenu implements IMenubarMenu {
 
   get items(): MenuItemConstructorOptions[] {
     const items = [
-      this.emailUs,
-      this.visitOurWebsite,
+      this.getHelp,
+      this.contactUs,
       this.fileBugReport,
       this.legal,
       this.separator,
@@ -44,19 +44,19 @@ export class HelpMenu implements IMenubarMenu {
     this._aboutMenu = aboutMenu;
   }
 
-  private get emailUs(): MenuItemConstructorOptions {
+  private get contactUs(): MenuItemConstructorOptions {
     return {
-      id: "emailUs",
-      label: this.localize("emailUs"),
-      click: () => shell.openExternal("mailTo:hello@bitwarden.com"),
+      id: "contactUs",
+      label: this.localize("contactUs"),
+      click: () => shell.openExternal("https://bitwarden.com/contact"),
     };
   }
 
-  private get visitOurWebsite(): MenuItemConstructorOptions {
+  private get getHelp(): MenuItemConstructorOptions {
     return {
-      id: "visitOurWebsite",
-      label: this.localize("visitOurWebsite"),
-      click: () => shell.openExternal("https://bitwarden.com/contact"),
+      id: "getHelp",
+      label: this.localize("getHelp"),
+      click: () => shell.openExternal("https://bitwarden.com/help"),
     };
   }