From 3c0082b1163b599839fb687a9dbe81318556a7d6 Mon Sep 17 00:00:00 2001
From: Ben Brown <benbro@microsoft.com>
Date: Tue, 4 May 2021 11:23:19 -0500
Subject: [PATCH 01/11] copy updates

---
 .../GetStarted/GetStartedNextSteps.tsx        | 44 ++++++++++++-------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/Composer/packages/client/src/components/GetStarted/GetStartedNextSteps.tsx b/Composer/packages/client/src/components/GetStarted/GetStartedNextSteps.tsx
index 5bd29fcf83..00155f7cae 100644
--- a/Composer/packages/client/src/components/GetStarted/GetStartedNextSteps.tsx
+++ b/Composer/packages/client/src/components/GetStarted/GetStartedNextSteps.tsx
@@ -132,8 +132,10 @@ export const GetStartedNextSteps: React.FC<GetStartedProps> = (props) => {
     if (props.requiresLUIS) {
       newNextSteps.push({
         key: 'luis',
-        label: formatMessage('Add a LUIS key'),
-        description: formatMessage('Setup Language Understanding so that you can start and test your bot.'),
+        label: formatMessage('Set up Language Understanding'),
+        description: formatMessage(
+          'Use machine learning to understand natural language input and direct the conversation flow.'
+        ),
         learnMore: 'https://aka.ms/composer-luis-learnmore',
         required: true,
         checked: hasLUIS,
@@ -153,8 +155,10 @@ export const GetStartedNextSteps: React.FC<GetStartedProps> = (props) => {
     if (props.requiresQNA) {
       newNextSteps.push({
         key: 'qna',
-        label: formatMessage('Add a QnA Maker key'),
-        description: formatMessage('Your template requires QnA Maker to access content for your bot.'),
+        label: formatMessage('Set up QnA Maker'),
+        description: formatMessage(
+          'Use Azure QnA Maker to create a simple question-and-answer bot from a website FAQ.'
+        ),
         learnMore: 'https://aka.ms/composer-addqnamaker-learnmore',
         required: true,
         checked: hasQNA,
@@ -196,7 +200,9 @@ export const GetStartedNextSteps: React.FC<GetStartedProps> = (props) => {
       newRecomendedSteps.push({
         key: 'publishing',
         label: formatMessage('Create a publishing profile'),
-        description: formatMessage('Set up hosting and other Azure resources to enable publishing'),
+        description: formatMessage(
+          'Create a publishing profile and configure Azure resources to publish your bot. A publishing profile provides the secure connectivity required to publish your bot.'
+        ),
         checked: hasPublishingProfile,
         learnMore: 'https://aka.ms/composer-getstarted-publishingprofile',
         onClick: () => {
@@ -225,8 +231,10 @@ export const GetStartedNextSteps: React.FC<GetStartedProps> = (props) => {
 
     newRecomendedSteps.push({
       key: 'editlg',
-      label: formatMessage('Edit what your bot says'),
-      description: formatMessage('Customize your bot by editing and adding bot responses.'),
+      label: formatMessage('Edit bot responses'),
+      description: formatMessage(
+        "Define your bot's responses, add phrase variations, execute simple expressions based on context, or refer to conversational memory."
+      ),
       learnMore: 'https://aka.ms/composer-getstarted-editbotsays',
       checked: false,
       onClick: () => {
@@ -237,8 +245,10 @@ export const GetStartedNextSteps: React.FC<GetStartedProps> = (props) => {
     });
     newRecomendedSteps.push({
       key: 'editlu',
-      label: formatMessage('Train your language model'),
-      description: formatMessage('Ensure your bot can understand your users by frequently training your LUIS model.'),
+      label: formatMessage('Edit user input and triggers'),
+      description: formatMessage(
+        'Define user input (intents) and trigger phrases that your bot can understand and use to determine what to do next in the conversation flow.'
+      ),
       learnMore: 'https://aka.ms/composer-luis-learnmore',
       checked: false,
       onClick: () => {
@@ -254,7 +264,9 @@ export const GetStartedNextSteps: React.FC<GetStartedProps> = (props) => {
       {
         key: 'packages',
         label: formatMessage('Add packages'),
-        description: formatMessage('Visit the Package manager to browse packages to add to your bot.'),
+        description: formatMessage(
+          'Packages are components for your bot, including customizable dialogs, bot response templates and custom actions.'
+        ),
         learnMore: 'https://aka.ms/composer-getstarted-addpackages',
         checked: false,
         onClick: () => {
@@ -265,10 +277,8 @@ export const GetStartedNextSteps: React.FC<GetStartedProps> = (props) => {
       },
       {
         key: 'insights',
-        label: formatMessage('Enable Insights'),
-        description: formatMessage(
-          'Collect service-level and conversation-level data to help gauge the performance and efficacy of your bot.'
-        ),
+        label: formatMessage('Enable App insights'),
+        description: formatMessage('Collect information about the use and performance of your bot.'),
         learnMore: 'https://aka.ms/composer-getstarted-enableinsights',
         checked: false,
         onClick: () => {
@@ -279,8 +289,10 @@ export const GetStartedNextSteps: React.FC<GetStartedProps> = (props) => {
       },
       {
         key: 'devops',
-        label: formatMessage('Publish to Dev Ops'),
-        description: formatMessage('Learn how to publish to a Dev Ops pipeline using CI / CD.'),
+        label: formatMessage('Set up continuous deployment (DevOps)'),
+        description: formatMessage(
+          'Build a continuous integration and deployment (CI/CD) pipeline with Azure Resource Manager templates.'
+        ),
         learnMore: 'https://aka.ms/bfcomposercicd',
         checked: false,
         onClick: () => {

From c0f2ca8ec2fe810a94d81e65bd249cb057d21f83 Mon Sep 17 00:00:00 2001
From: Ben Brown <benbro@microsoft.com>
Date: Tue, 4 May 2021 12:30:09 -0500
Subject: [PATCH 02/11] Fixes for LUIS service copy

---
 .../src/components/ManageLuis/ManageLuis.tsx  |  7 +-
 .../ManageService/ManageService.tsx           | 75 +++++++++++--------
 2 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/Composer/packages/client/src/components/ManageLuis/ManageLuis.tsx b/Composer/packages/client/src/components/ManageLuis/ManageLuis.tsx
index 9566ae21c0..45d338377c 100644
--- a/Composer/packages/client/src/components/ManageLuis/ManageLuis.tsx
+++ b/Composer/packages/client/src/components/ManageLuis/ManageLuis.tsx
@@ -50,13 +50,16 @@ export const ManageLuis = (props: ManageLuisProps) => {
     <ManageService
       createService={createService}
       handoffInstructions={formatMessage(
-        '1. Using the Azure portal, please create a Language Understanding resource on my behalf.\n2. Once provisioned, securely share the resulting credentials with me as described in the link below.\n\nDetailed instructions:\nhttps://aka.ms/bfcomposerhandoffluis'
+        '1. Using the Azure portal, please create a Language Understanding resource.\n2. Once created, securely share the resulting credentials with me as described in the link below.\n\nDetailed instructions:\nhttps://aka.ms/bfcomposerhandoffluis'
       )}
       hidden={props.hidden}
+      introText={formatMessage(
+        'To understand natural language input and direct the conversation flow, your bot needs a language understanding service. '
+      )}
       learnMore={'https://aka.ms/composer-luis-learnmore'}
       regions={LUIS_REGIONS}
       serviceKeyType={'LUIS.Authoring'}
-      serviceName={'LUIS'}
+      serviceName={'Language Understanding'}
       onDismiss={props.onDismiss}
       onGetKey={props.onGetKey}
       onNext={props.onNext}
diff --git a/Composer/packages/client/src/components/ManageService/ManageService.tsx b/Composer/packages/client/src/components/ManageService/ManageService.tsx
index 0fb074c414..b0a55192b6 100644
--- a/Composer/packages/client/src/components/ManageService/ManageService.tsx
+++ b/Composer/packages/client/src/components/ManageService/ManageService.tsx
@@ -23,6 +23,7 @@ import { ProvisionHandoff } from '@bfc/ui-shared';
 import sortBy from 'lodash/sortBy';
 import { NeutralColors } from '@uifabric/fluent-theme';
 import { AzureTenant } from '@botframework-composer/types';
+import { escapeRegExp } from 'lodash';
 
 import TelemetryClient from '../../telemetry/TelemetryClient';
 import { AuthClient } from '../../utils/authClient';
@@ -42,6 +43,7 @@ type ManageServiceProps = {
   createServiceInBackground?: boolean;
   handoffInstructions: string;
   hidden: boolean;
+  introText: string;
   learnMore?: string;
   onDismiss: () => void;
   onGetKey: (settings: { key: string; region: string }) => void;
@@ -95,6 +97,7 @@ export const ManageService = (props: ManageServiceProps) => {
   const [availableSubscriptions, setAvailableSubscriptions] = useState<Subscription[]>([]);
   const [subscriptionsErrorMessage, setSubscriptionsErrorMessage] = useState<string>();
   const [keys, setKeys] = useState<KeyRec[]>([]);
+  const [dialogTitle, setDialogTitle] = useState<string>('');
 
   const [currentStep, setCurrentStep] = useState<Step>('intro');
   const [outcomeDescription, setOutcomeDescription] = useState<string>('');
@@ -103,12 +106,12 @@ export const ManageService = (props: ManageServiceProps) => {
   const [locationList, setLocationList] = useState<IDropdownOption[]>(props.regions || []);
 
   const actionOptions: IChoiceGroupOption[] = [
-    { key: 'choose', text: formatMessage('Choose from existing') },
+    { key: 'choose', text: formatMessage('Use existing resources') },
     {
       key: 'create',
-      text: formatMessage('Create a new {service} resource', { service: props.serviceName }),
+      text: formatMessage('Create and configure new Azure resources', { service: props.serviceName }),
     },
-    { key: 'handoff', text: formatMessage('Handoff to admin') },
+    { key: 'handoff', text: formatMessage('Generate instructions for Azure administrator') },
   ];
 
   const fetchLocations = async (subscriptionId) => {
@@ -505,9 +508,7 @@ export const ManageService = (props: ManageServiceProps) => {
       <div>
         <div css={dialogBodyStyles}>
           <p css={{ marginTop: 0 }}>
-            {formatMessage(
-              'Select your Azure directory, then choose the subscription where your existing resource is located and the keys you want to use. '
-            )}
+            {props.introText}
             {props.learnMore ? (
               <Link href={props.learnMore} target={'_blank'}>
                 {formatMessage('Learn more')}
@@ -536,7 +537,7 @@ export const ManageService = (props: ManageServiceProps) => {
         <div css={dialogBodyStyles}>
           <p css={{ marginTop: 0 }}>
             {formatMessage(
-              'Select your Azure directory, then choose the subscription where you’d like your new {service} resource. ',
+              'Select your Azure directory, then choose the subscription where your existing {service} resource is located. ',
               { service: props.serviceName }
             )}
             {props.learnMore ? (
@@ -562,7 +563,7 @@ export const ManageService = (props: ManageServiceProps) => {
               required
               disabled={!(availableSubscriptions?.length > 0)}
               errorMessage={subscriptionsErrorMessage}
-              label={formatMessage('Subscription')}
+              label={formatMessage('Azure subscription')}
               options={
                 availableSubscriptions
                   ?.filter((p) => p.subscriptionId && p.displayName)
@@ -570,7 +571,7 @@ export const ManageService = (props: ManageServiceProps) => {
                     return { key: p.subscriptionId ?? '', text: p.displayName ?? formatMessage('Unnamed') };
                   }) ?? []
               }
-              placeholder={formatMessage('Select one')}
+              placeholder={formatMessage('Select a subscription')}
               selectedKey={subscriptionId}
               styles={dropdownStyles}
               onChange={onChangeSubscription}
@@ -591,13 +592,13 @@ export const ManageService = (props: ManageServiceProps) => {
               <div>
                 <Dropdown
                   disabled={!(keys?.length > 0) || nextAction !== 'choose'}
-                  label={formatMessage('{service} Key', { service: props.serviceName })}
+                  label={formatMessage('{service} resource name', { service: props.serviceName })}
                   options={
                     keys.map((p) => {
                       return { text: p.name, ...p };
                     }) ?? []
                   }
-                  placeholder={formatMessage('Select one')}
+                  placeholder={formatMessage('Select resource')}
                   styles={dropdownStyles}
                   onChange={onChangeKey}
                 />
@@ -624,22 +625,21 @@ export const ManageService = (props: ManageServiceProps) => {
       <div>
         <div css={dialogBodyStyles}>
           <p css={{ marginTop: 0 }}>
-            {formatMessage(
-              'Input your details below to create a new {service} resource. You will be able to manage your new resource in the Azure portal.',
-              { service: props.serviceName }
-            )}
+            {formatMessage('Select the resource group and region in which your {service} service will be created.', {
+              service: props.serviceName,
+            })}
           </p>
 
           <div css={mainElementStyle}>
             <Dropdown
               disabled={!subscriptionId || resourceGroups.length === 0 || !!loading}
-              label={formatMessage('Resource group')}
+              label={formatMessage('Azure resource group')}
               options={
                 resourceGroups.map((p) => {
                   return { key: p.id, text: p.name, data: p.data };
                 }) ?? []
               }
-              placeholder={formatMessage('Select one')}
+              placeholder={formatMessage('Select a resource group')}
               selectedKey={resourceGroupKey}
               styles={dropdownStyles}
               onChange={onChangeResourceGroup}
@@ -669,18 +669,18 @@ export const ManageService = (props: ManageServiceProps) => {
               id={'region'}
               label={formatMessage('Region')}
               options={locationList}
-              placeholder={formatMessage('Enter region')}
+              placeholder={formatMessage('Select region')}
               selectedKey={region}
               styles={dropdownStyles}
               onChange={handleRegionOnChange}
             />
             <TextField
               required
-              aria-label={formatMessage('Resource name')}
+              aria-label={formatMessage('{service} resource name', { service: props.serviceName })}
               data-testid={'resourceName'}
               disabled={!subscriptionId || !!loading}
               id={'resourceName'}
-              label={formatMessage('Resource name')}
+              label={formatMessage('{service} resource name', { service: props.serviceName })}
               placeholder={formatMessage('Enter name for new resources')}
               styles={inputStyles}
               value={resourceName}
@@ -780,7 +780,7 @@ export const ManageService = (props: ManageServiceProps) => {
               required
               disabled={availableSubscriptions?.length === 0}
               errorMessage={subscriptionsErrorMessage}
-              label={formatMessage('Subscription')}
+              label={formatMessage('Azure subscription')}
               options={
                 availableSubscriptions
                   ?.filter((p) => p.subscriptionId && p.displayName)
@@ -788,7 +788,7 @@ export const ManageService = (props: ManageServiceProps) => {
                     return { key: p.subscriptionId ?? '', text: p.displayName ?? formatMessage('Unnamed') };
                   }) ?? []
               }
-              placeholder={formatMessage('Select one')}
+              placeholder={formatMessage('Select subscription')}
               selectedKey={subscriptionId}
               styles={dropdownStyles}
               onChange={onChangeSubscription}
@@ -828,6 +828,24 @@ export const ManageService = (props: ManageServiceProps) => {
     }
   };
 
+  useEffect(() => {
+    switch (currentStep) {
+      case 'intro':
+        setDialogTitle(formatMessage('Set up {service}', { service: props.serviceName }));
+        break;
+      case 'subscription':
+        if (nextAction === 'choose') {
+          setDialogTitle(formatMessage('Select {service} resources', { service: props.serviceName }));
+        } else {
+          setDialogTitle(formatMessage('Create {service} resources', { service: props.serviceName }));
+        }
+        break;
+      case 'resourceCreation':
+        setDialogTitle(formatMessage('Create {service} resources', { service: props.serviceName }));
+        break;
+    }
+  }, [currentStep]);
+
   return (
     <Fragment>
       {showAuthDialog && (
@@ -841,14 +859,14 @@ export const ManageService = (props: ManageServiceProps) => {
       )}
       <ProvisionHandoff
         developerInstructions={formatMessage(
-          'Copy and share this information with your Azure admin to provision resources on your behalf.'
+          'If Azure resources and subscription are managed by others, use the following information to request creation of the resources that you need to build and run your bot.'
         )}
         handoffInstructions={formatMessage(
-          'I am working on a Microsoft Bot Framework project, and I now require some Azure resources to be created. Please follow the instructions below to create these resources and provide them to me.\n\n{instructions}',
-          { instructions: props.handoffInstructions }
+          'I am creating a conversational experience using Microsoft Bot Framework project. For my project to work, it needs Azure resources including {service}. Below are the steps to create these resources.\n\n{instructions}',
+          { instructions: props.handoffInstructions, service: props.serviceName }
         )}
         hidden={!showHandoff}
-        title={formatMessage('Share resource request')}
+        title={formatMessage('Generate instructions for Azure administrator')}
         onBack={() => {
           setShowHandoff(false);
           props.onToggleVisibility(true);
@@ -858,10 +876,7 @@ export const ManageService = (props: ManageServiceProps) => {
       <Dialog
         dialogContentProps={{
           type: DialogType.normal,
-          title:
-            nextAction === 'create'
-              ? formatMessage('Create new {service} resource', { service: props.serviceName })
-              : formatMessage('Select {service} key', { service: props.serviceName }),
+          title: dialogTitle,
         }}
         hidden={props.hidden || showAuthDialog}
         minWidth={480}

From 0ac5320e53000438a441d31abfb11349b5adaec6 Mon Sep 17 00:00:00 2001
From: Ben Brown <benbro@microsoft.com>
Date: Tue, 4 May 2021 12:35:36 -0500
Subject: [PATCH 03/11] adjustments for qna and speech copy

---
 Composer/packages/client/src/components/ManageQNA/ManageQNA.tsx  | 1 +
 .../packages/client/src/components/ManageSpeech/ManageSpeech.tsx | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Composer/packages/client/src/components/ManageQNA/ManageQNA.tsx b/Composer/packages/client/src/components/ManageQNA/ManageQNA.tsx
index 9f231a49bb..a2f8fe581b 100644
--- a/Composer/packages/client/src/components/ManageQNA/ManageQNA.tsx
+++ b/Composer/packages/client/src/components/ManageQNA/ManageQNA.tsx
@@ -63,6 +63,7 @@ export const ManageQNA = (props: ManageQNAProps) => {
         '1. Using the Azure portal, please create a QnAMaker resource on my behalf.\n2. Once provisioned, securely share the resulting credentials with me as described in the link below.\n\nDetailed instructions:\nhttps://aka.ms/bfcomposerhandoffqnamaker'
       )}
       hidden={props.hidden}
+      introText={formatMessage('Use Azure QnA Maker to create a simple question-and-answer bot from a website FAQ. ')}
       learnMore={'https://aka.ms/composer-addqnamaker-learnmore'}
       regions={QNA_REGIONS}
       serviceKeyType={'QnAMaker'}
diff --git a/Composer/packages/client/src/components/ManageSpeech/ManageSpeech.tsx b/Composer/packages/client/src/components/ManageSpeech/ManageSpeech.tsx
index 625e757239..8f83982253 100644
--- a/Composer/packages/client/src/components/ManageSpeech/ManageSpeech.tsx
+++ b/Composer/packages/client/src/components/ManageSpeech/ManageSpeech.tsx
@@ -49,6 +49,7 @@ export const ManageSpeech = (props: ManageSpeechProps) => {
         '1. Using the Azure portal, please create a Speech resource on my behalf.\n2. Once provisioned, securely share the resulting credentials with me as described in the link below.\n\nDetailed instructions:\nhttps://aka.ms/bfcomposerhandoffdls'
       )}
       hidden={props.hidden}
+      introText={formatMessage('Use Speech to enable voice input and output for your bot.')}
       serviceKeyType={'SpeechServices'}
       serviceName={'Speech'}
       onDismiss={props.onDismiss}

From 5987f7631e59ab0ac74bceac9833a4565024aabe Mon Sep 17 00:00:00 2001
From: Ben Brown <benbro@microsoft.com>
Date: Tue, 4 May 2021 14:24:26 -0500
Subject: [PATCH 04/11] qna maker copy changes

---
 .../src/components/GetStarted/GetStarted.tsx       |  4 ++--
 .../components/GetStarted/GetStartedNextSteps.tsx  | 10 +++-------
 .../src/components/ProjectTree/ProjectTree.tsx     |  4 ++--
 .../components/QnA/CreateQnAFromScratchModal.tsx   |  4 ++--
 .../src/components/QnA/CreateQnAFromUrlModal.tsx   | 14 ++++++--------
 .../src/components/QnA/EditQnAFromUrlModal.tsx     |  4 ++--
 .../src/components/QnA/ImportQnAFromUrlModal.tsx   |  2 +-
 Composer/packages/client/src/constants.ts          |  2 +-
 .../packages/client/src/utils/notifications.ts     |  4 ++--
 9 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/Composer/packages/client/src/components/GetStarted/GetStarted.tsx b/Composer/packages/client/src/components/GetStarted/GetStarted.tsx
index b1e3130a9f..08da4a9896 100644
--- a/Composer/packages/client/src/components/GetStarted/GetStarted.tsx
+++ b/Composer/packages/client/src/components/GetStarted/GetStarted.tsx
@@ -35,10 +35,10 @@ export const GetStarted: React.FC<GetStartedProps> = (props) => {
     return (
       <Stack grow styles={{ root: { alignSelf: 'flex-start', padding: '0 20px' } }}>
         <Pivot styles={{ link: { fontSize: '20px' }, linkIsSelected: { fontSize: '20px' } }}>
-          <PivotItem headerText={formatMessage('Next steps')}>
+          <PivotItem headerText={formatMessage('Get started')}>
             <GetStartedNextSteps {...props} />
           </PivotItem>
-          <PivotItem headerText={formatMessage('Learning')}>
+          <PivotItem headerText={formatMessage('Learn more')}>
             <GetStartedLearn projectId={projectId} onDismiss={onDismiss} />
           </PivotItem>
         </Pivot>
diff --git a/Composer/packages/client/src/components/GetStarted/GetStartedNextSteps.tsx b/Composer/packages/client/src/components/GetStarted/GetStartedNextSteps.tsx
index 00155f7cae..923875cfe7 100644
--- a/Composer/packages/client/src/components/GetStarted/GetStartedNextSteps.tsx
+++ b/Composer/packages/client/src/components/GetStarted/GetStartedNextSteps.tsx
@@ -201,7 +201,7 @@ export const GetStartedNextSteps: React.FC<GetStartedProps> = (props) => {
         key: 'publishing',
         label: formatMessage('Create a publishing profile'),
         description: formatMessage(
-          'Create a publishing profile and configure Azure resources to publish your bot. A publishing profile provides the secure connectivity required to publish your bot.'
+          'A publishing profile provides the secure connectivity required to publish your bot.'
         ),
         checked: hasPublishingProfile,
         learnMore: 'https://aka.ms/composer-getstarted-publishingprofile',
@@ -246,9 +246,7 @@ export const GetStartedNextSteps: React.FC<GetStartedProps> = (props) => {
     newRecomendedSteps.push({
       key: 'editlu',
       label: formatMessage('Edit user input and triggers'),
-      description: formatMessage(
-        'Define user input (intents) and trigger phrases that your bot can understand and use to determine what to do next in the conversation flow.'
-      ),
+      description: formatMessage('Define user input and trigger phrases to direct the conversation flow.'),
       learnMore: 'https://aka.ms/composer-luis-learnmore',
       checked: false,
       onClick: () => {
@@ -264,9 +262,7 @@ export const GetStartedNextSteps: React.FC<GetStartedProps> = (props) => {
       {
         key: 'packages',
         label: formatMessage('Add packages'),
-        description: formatMessage(
-          'Packages are components for your bot, including customizable dialogs, bot response templates and custom actions.'
-        ),
+        description: formatMessage('Extend your bot with reusable dialogs, bot response templates and custom actions.'),
         learnMore: 'https://aka.ms/composer-getstarted-addpackages',
         checked: false,
         onClick: () => {
diff --git a/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx b/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx
index 2f0795b4ca..9311de2920 100644
--- a/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx
+++ b/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx
@@ -216,7 +216,7 @@ export const ProjectTree: React.FC<Props> = ({
     };
     const menu: TreeMenuItem[] = [
       {
-        label: formatMessage('Add a trigger'),
+        label: formatMessage('Add new trigger'),
         icon: 'Add',
         onClick: () => {
           onDialogCreateTrigger(skillId, dialog.id);
@@ -230,7 +230,7 @@ export const ProjectTree: React.FC<Props> = ({
     ];
 
     const QnAMenuItem = {
-      label: formatMessage('Add new knowledge base'),
+      label: formatMessage('Add QnA Maker knowledge base'),
       icon: 'Add',
       onClick: () => {
         createQnAFromUrlDialogBegin({ projectId: skillId, dialogId: dialog.id });
diff --git a/Composer/packages/client/src/components/QnA/CreateQnAFromScratchModal.tsx b/Composer/packages/client/src/components/QnA/CreateQnAFromScratchModal.tsx
index 67a9c179fa..19dd8d7236 100644
--- a/Composer/packages/client/src/components/QnA/CreateQnAFromScratchModal.tsx
+++ b/Composer/packages/client/src/components/QnA/CreateQnAFromScratchModal.tsx
@@ -28,7 +28,7 @@ const formConfig: FieldConfig<CreateQnAFromScratchFormData> = {
 const DialogTitle = () => {
   return (
     <div>
-      {formatMessage('Create new knowledge base')}
+      {formatMessage('Add QnA Maker knowledge base')}
       <p>
         <span css={subText}>{formatMessage('Manually add question and answer pairs to create a knowledge base')}</span>
       </p>
@@ -102,7 +102,7 @@ export const CreateQnAFromScratchModal: React.FC<CreateQnAFromModalProps> = (pro
         <PrimaryButton
           data-testid={'createKnowledgeBase'}
           disabled={disabled}
-          text={formatMessage('Create knowledge base')}
+          text={formatMessage('Create')}
           onClick={() => {
             if (hasErrors) {
               return;
diff --git a/Composer/packages/client/src/components/QnA/CreateQnAFromUrlModal.tsx b/Composer/packages/client/src/components/QnA/CreateQnAFromUrlModal.tsx
index 9667d71b9d..a7ab4aa5bb 100644
--- a/Composer/packages/client/src/components/QnA/CreateQnAFromUrlModal.tsx
+++ b/Composer/packages/client/src/components/QnA/CreateQnAFromUrlModal.tsx
@@ -41,12 +41,10 @@ import {
 const DialogTitle = () => {
   return (
     <div>
-      {formatMessage('Create new knowledge base')}
+      {formatMessage('Add QnA Maker knowledge base')}
       <p>
         <span css={subText}>
-          {formatMessage(
-            'Extract question-and-answer pairs from an online FAQ, product manuals, or other files. Supported formats are .tsv, .pdf, .doc, .docx, .xlsx, containing questions and answers in sequence. '
-          )}
+          {formatMessage('Use Azure QnA Maker to extract question-and-answer pairs from an online FAQ. ')}
           <Link href={knowledgeBaseSourceUrl} target={'_blank'}>
             {formatMessage('Learn more about knowledge base sources. ')}
           </Link>
@@ -205,7 +203,7 @@ export const CreateQnAFromUrlModal: React.FC<CreateQnAFromUrlModalProps> = (prop
             value={formData.name}
             onChange={(e, name) => onChangeNameField(name)}
           />
-          <Text styles={knowledgeBaseStyle}>{formatMessage('Knowledge base')}</Text>
+          <Text styles={knowledgeBaseStyle}>{formatMessage('FAQ website (source)')}</Text>
           {formData.locales.map((locale, i) => {
             return (
               <div key={`add${locale}InCreateQnAFromUrlModal`} css={urlPairStyle}>
@@ -213,7 +211,7 @@ export const CreateQnAFromUrlModal: React.FC<CreateQnAFromUrlModalProps> = (prop
                   data-testid={`add${locale}InCreateQnAFromUrlModal`}
                   errorMessage={formDataErrors.urls[i]}
                   label={usedLocales[i]}
-                  placeholder={formatMessage('Enter a URL')}
+                  placeholder={formatMessage('Type or paste URL')}
                   required={i === 0}
                   styles={textFieldUrl}
                   value={formData.urls[i]}
@@ -238,7 +236,7 @@ export const CreateQnAFromUrlModal: React.FC<CreateQnAFromUrlModalProps> = (prop
         <DefaultButton
           data-testid={'createKnowledgeBaseFromScratch'}
           styles={{ root: { float: 'left' } }}
-          text={formatMessage('Create knowledge base from scratch')}
+          text={formatMessage('Create custom knowledge base')}
           onClick={() => {
             // switch to create from scratch flow, pass onComplete callback.
             actions.createQnAFromScratchDialogBegin({ projectId, dialogId, onComplete: onComplete?.func });
@@ -253,7 +251,7 @@ export const CreateQnAFromUrlModal: React.FC<CreateQnAFromUrlModalProps> = (prop
         <PrimaryButton
           data-testid={'createKnowledgeBase'}
           disabled={disabled}
-          text={formatMessage('Create knowledge base')}
+          text={formatMessage('Create')}
           onClick={() => {
             if (hasErrors(formDataErrors)) {
               return;
diff --git a/Composer/packages/client/src/components/QnA/EditQnAFromUrlModal.tsx b/Composer/packages/client/src/components/QnA/EditQnAFromUrlModal.tsx
index 8a92cc8d42..d787ad230b 100644
--- a/Composer/packages/client/src/components/QnA/EditQnAFromUrlModal.tsx
+++ b/Composer/packages/client/src/components/QnA/EditQnAFromUrlModal.tsx
@@ -98,8 +98,8 @@ export const EditQnAFromUrlModal: React.FC<EditQnAFromUrlModalProps> = (props) =
             disabled
             data-testid={`knowledgeLocationTextField-url`}
             errorMessage={formErrors.url}
-            label={formatMessage('Knowledge source')}
-            placeholder={formatMessage('Enter a URL or browse to upload a file ')}
+            label={formatMessage('FAQ website (source)')}
+            placeholder={formatMessage('Type or paste URL')}
             styles={textFieldKBNameFromScratch}
             value={formData.url}
             onChange={(e, url) => updateUrl(url)}
diff --git a/Composer/packages/client/src/components/QnA/ImportQnAFromUrlModal.tsx b/Composer/packages/client/src/components/QnA/ImportQnAFromUrlModal.tsx
index cc4497bb5b..27c10a7d90 100644
--- a/Composer/packages/client/src/components/QnA/ImportQnAFromUrlModal.tsx
+++ b/Composer/packages/client/src/components/QnA/ImportQnAFromUrlModal.tsx
@@ -80,7 +80,7 @@ export const ImportQnAFromUrlModal: React.FC<ImportQnAFromUrlModalProps> = (prop
           <TextField
             data-testId={'ImportNewUrlToOverwriteQnAFile'}
             errorMessage={formErrors.url}
-            label={formatMessage('Knowledge source')}
+            label={formatMessage('FAQ website (source)')}
             placeholder={formatMessage('Enter a URL to Import QnA resource')}
             styles={textFieldKBNameFromScratch}
             value={formData.url}
diff --git a/Composer/packages/client/src/constants.ts b/Composer/packages/client/src/constants.ts
index 58a856820e..474d937fc1 100644
--- a/Composer/packages/client/src/constants.ts
+++ b/Composer/packages/client/src/constants.ts
@@ -259,7 +259,7 @@ export const DialogCreationCopy = {
   },
   get IMPORT_QNA() {
     return {
-      title: formatMessage('Create new knowledge base'),
+      title: formatMessage('Add QnA Maker knowledge base'),
       subText: formatMessage(
         'Extract question-and-answer pairs from an online FAQ, product manuals, or other files. Supported formats are .tsv, .pdf, .doc, .docx, .xlsx, containing questions and answers in sequence. Learn more about knowledge base sources. Skip this step to add questions and answers manually after creation. The number of sources and file size you can add depends on the QnA service SKU you choose. Learn more about QnA Maker SKUs.'
       ),
diff --git a/Composer/packages/client/src/utils/notifications.ts b/Composer/packages/client/src/utils/notifications.ts
index f75ed8482c..95134ec0dc 100644
--- a/Composer/packages/client/src/utils/notifications.ts
+++ b/Composer/packages/client/src/utils/notifications.ts
@@ -5,8 +5,8 @@ import formatMessage from 'format-message';
 import { CardProps } from './../components/Notifications/NotificationCard';
 export const getQnaPendingNotification = (url: string): CardProps => {
   return {
-    title: formatMessage('Creating your knowledge base'),
-    description: formatMessage('Extracting QNA pairs from {url}', { url }),
+    title: formatMessage('Creating knowledge base...'),
+    description: formatMessage('Extracting question-and-answer pairs from {url}', { url }),
     type: 'pending',
   };
 };

From 799277be0e2f7fe837f96c30c4083ec87cd01519 Mon Sep 17 00:00:00 2001
From: Ben Brown <benbro@microsoft.com>
Date: Tue, 4 May 2021 15:14:40 -0500
Subject: [PATCH 05/11] copy changes

---
 .../cypress/integration/LuisDeploy.spec.ts    |  2 +-
 .../components/QnA/CreateQnAFromUrlModal.tsx  |  2 +-
 .../src/pages/botProject/AppIdAndPassword.tsx |  8 ++--
 .../src/pages/botProject/BotProjectInfo.tsx   | 43 +++++++++----------
 .../pages/botProject/BotProjectSettings.tsx   |  4 +-
 .../botProject/BotProjectsSettingsTabView.tsx | 10 ++---
 .../GetAppInfoFromPublishProfileDialog.tsx    |  8 ++--
 .../botProject/RootBotExternalService.tsx     | 36 ++++++++--------
 .../botProject/SkillBotExternalService.tsx    | 26 +++++------
 .../botProject/adapters/AdapterSection.tsx    |  2 +-
 .../runtime-settings/RuntimeSettings.tsx      |  4 +-
 11 files changed, 71 insertions(+), 74 deletions(-)

diff --git a/Composer/cypress/integration/LuisDeploy.spec.ts b/Composer/cypress/integration/LuisDeploy.spec.ts
index 3f2372c34f..c72b09f0c4 100644
--- a/Composer/cypress/integration/LuisDeploy.spec.ts
+++ b/Composer/cypress/integration/LuisDeploy.spec.ts
@@ -14,7 +14,7 @@ context('Luis Deploy', () => {
 
   it('can deploy luis success', () => {
     cy.visitPage('Project settings');
-    cy.findByText('Development Resources').click();
+    cy.findByText('Development resources').click();
     cy.findAllByTestId('rootLUISAuthoringKey').type('12345678', { delay: 200 });
     cy.findAllByTestId('rootLUISRegion').click();
     cy.findByText('West US').click();
diff --git a/Composer/packages/client/src/components/QnA/CreateQnAFromUrlModal.tsx b/Composer/packages/client/src/components/QnA/CreateQnAFromUrlModal.tsx
index a7ab4aa5bb..1e12dee3a8 100644
--- a/Composer/packages/client/src/components/QnA/CreateQnAFromUrlModal.tsx
+++ b/Composer/packages/client/src/components/QnA/CreateQnAFromUrlModal.tsx
@@ -46,7 +46,7 @@ const DialogTitle = () => {
         <span css={subText}>
           {formatMessage('Use Azure QnA Maker to extract question-and-answer pairs from an online FAQ. ')}
           <Link href={knowledgeBaseSourceUrl} target={'_blank'}>
-            {formatMessage('Learn more about knowledge base sources. ')}
+            {formatMessage('Learn more')}
           </Link>
         </span>
       </p>
diff --git a/Composer/packages/client/src/pages/botProject/AppIdAndPassword.tsx b/Composer/packages/client/src/pages/botProject/AppIdAndPassword.tsx
index b3be8f4701..7fd0bf895f 100644
--- a/Composer/packages/client/src/pages/botProject/AppIdAndPassword.tsx
+++ b/Composer/packages/client/src/pages/botProject/AppIdAndPassword.tsx
@@ -121,7 +121,7 @@ export const AppIdAndPassword: React.FC<AppIdAndPasswordProps> = (props) => {
       <div css={title}>{formatMessage('Microsoft App ID')}</div>
       <div css={subtext}>
         {formatMessage.rich(
-          'An App ID is used for communication between your bot and skills, services, websites or applications. An App ID is created when you provision resources for your bot. If you’ve created an App ID already, you can use that ID instead. <a>Learn more.</a>',
+          'An App ID is used for communication between your bot and skills, services, websites or applications. Use an existing App ID or automatically generate an App ID when creating a publishing profile for this bot. <a>Learn more.</a>',
           {
             a: ({ children }) => (
               <Link key="app-id-settings-page" href={'https://aka.ms/composer-appid-learnmore'} target="_blank">
@@ -136,7 +136,7 @@ export const AppIdAndPassword: React.FC<AppIdAndPasswordProps> = (props) => {
           ariaLabel={formatMessage('Microsoft App Id')}
           data-testid={'MicrosoftAppId'}
           label={formatMessage('Microsoft App Id')}
-          placeholder={formatMessage('Enter Microsoft App Id')}
+          placeholder={formatMessage('Type App Id')}
           styles={inputFieldStyles}
           value={localMicrosoftAppId}
           onBlur={handleAppIdOnBlur}
@@ -147,7 +147,7 @@ export const AppIdAndPassword: React.FC<AppIdAndPasswordProps> = (props) => {
           ariaLabel={formatMessage('Microsoft App Password')}
           data-testid={'MicrosoftPassword'}
           label={formatMessage('Microsoft App Password')}
-          placeholder={formatMessage('Enter Microsoft App Password')}
+          placeholder={formatMessage('Type App Password')}
           styles={inputFieldStyles}
           value={localMicrosoftAppPassword}
           onBlur={handleAppPasswordOnBlur}
@@ -156,7 +156,7 @@ export const AppIdAndPassword: React.FC<AppIdAndPasswordProps> = (props) => {
         />
         <PrimaryButton
           styles={{ root: { width: '230px', marginTop: '15px' } }}
-          text={formatMessage('Add from publishing profile')}
+          text={formatMessage('Retrieve App ID')}
           onClick={() => {
             setShowImportDialog(true);
           }}
diff --git a/Composer/packages/client/src/pages/botProject/BotProjectInfo.tsx b/Composer/packages/client/src/pages/botProject/BotProjectInfo.tsx
index 2540714699..5af5af4aff 100644
--- a/Composer/packages/client/src/pages/botProject/BotProjectInfo.tsx
+++ b/Composer/packages/client/src/pages/botProject/BotProjectInfo.tsx
@@ -51,31 +51,28 @@ export const BotProjectInfo: React.FC<RouteComponentProps<{
       </h3>
       <Stack tokens={{ childrenGap: 10 }}>
         <StackItem>
-          <div css={labelStyle}>{formatMessage('File Location')}</div>
+          <div css={labelStyle}>{formatMessage('Bot project location')}</div>
           <div css={valueStyle}>{location}</div>
         </StackItem>
-        <StackItem>
-          <div css={labelStyle}>{formatMessage('Read Me')}</div>
-          {readme && (
-            <Fragment>
-              <Link
-                onClick={() => {
-                  setReadmeHidden(false);
-                }}
-              >
-                {formatMessage('View project readme')}
-              </Link>
-              <DisplayMarkdownDialog
-                content={readme}
-                hidden={readmeHidden}
-                title={formatMessage('Project Readme')}
-                onDismiss={() => {
-                  setReadmeHidden(true);
-                }}
-              />
-            </Fragment>
-          )}
-        </StackItem>
+        {readme && (
+          <StackItem>
+            <Link
+              onClick={() => {
+                setReadmeHidden(false);
+              }}
+            >
+              {formatMessage('View readme')}
+            </Link>
+            <DisplayMarkdownDialog
+              content={readme}
+              hidden={readmeHidden}
+              title={formatMessage('Project readme')}
+              onDismiss={() => {
+                setReadmeHidden(true);
+              }}
+            />
+          </StackItem>
+        )}
       </Stack>
     </div>
   );
diff --git a/Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx b/Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx
index 5782b34626..defd32ebc5 100644
--- a/Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx
+++ b/Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx
@@ -163,7 +163,7 @@ const BotProjectSettings: React.FC<RouteComponentProps<{ projectId: string; skil
 
   const onRenderHeaderContent = () => {
     return formatMessage(
-      'This Page contains detailed information about your bot. For security reasons, they are hidden by default. To test your bot or publish to Azure, you may need to provide these settings.'
+      "Review and configure your bot's resources, and add new connections such as speech, Microsoft Teams and more."
     );
   };
 
@@ -193,7 +193,7 @@ const BotProjectSettings: React.FC<RouteComponentProps<{ projectId: string; skil
       navRegionName={formatMessage('Bot Projects Settings Navigation Pane')}
       pageMode={'botProjectsSettings'}
       shouldShowEditorError={false}
-      title={formatMessage('Bot management and configurations')}
+      title={formatMessage('Configure your bot')}
       toolbarItems={toolbarItems}
       onRenderHeaderContent={onRenderHeaderContent}
     >
diff --git a/Composer/packages/client/src/pages/botProject/BotProjectsSettingsTabView.tsx b/Composer/packages/client/src/pages/botProject/BotProjectsSettingsTabView.tsx
index 862208fcd8..6e4b6065f4 100644
--- a/Composer/packages/client/src/pages/botProject/BotProjectsSettingsTabView.tsx
+++ b/Composer/packages/client/src/pages/botProject/BotProjectsSettingsTabView.tsx
@@ -101,17 +101,17 @@ export const BotProjectSettingsTabView: React.FC<RouteComponentProps<{
         <PivotItem
           data-testid="developmentResourcesTab"
           headerButtonProps={isPVABot ? disabledPivotStyle : {}}
-          headerText={formatMessage('Development Resources')}
+          headerText={formatMessage('Development resources')}
           itemKey={PivotItemKey.LuisQna}
           onRenderItemLink={() => {
             if (isPVABot) {
               return (
                 <DisableFeatureToolTip isPVABot={isPVABot}>
-                  {formatMessage('Development Resources')}
+                  {formatMessage('Development resources')}
                 </DisableFeatureToolTip>
               );
             } else {
-              return <Fragment>{formatMessage('Development Resources')}</Fragment>;
+              return <Fragment>{formatMessage('Development resources')}</Fragment>;
             }
           }}
         >
@@ -145,11 +145,11 @@ export const BotProjectSettingsTabView: React.FC<RouteComponentProps<{
             if (isPVABot) {
               return (
                 <DisableFeatureToolTip isPVABot={isPVABot}>
-                  {formatMessage('Skill Configuration')}
+                  {formatMessage('Skill configuration')}
                 </DisableFeatureToolTip>
               );
             } else {
-              return <Fragment>{formatMessage('Skill Configuration')}</Fragment>;
+              return <Fragment>{formatMessage('Skill configuration')}</Fragment>;
             }
           }}
         >
diff --git a/Composer/packages/client/src/pages/botProject/GetAppInfoFromPublishProfileDialog.tsx b/Composer/packages/client/src/pages/botProject/GetAppInfoFromPublishProfileDialog.tsx
index f718e435fb..994b00b6d9 100644
--- a/Composer/packages/client/src/pages/botProject/GetAppInfoFromPublishProfileDialog.tsx
+++ b/Composer/packages/client/src/pages/botProject/GetAppInfoFromPublishProfileDialog.tsx
@@ -64,8 +64,10 @@ export const GetAppInfoFromPublishProfileDialog: React.FC<Props> = (props) => {
   }, [publishTargetOptions]);
 
   const dialogTitle = {
-    title: formatMessage('Add from publishing profile'),
-    subText: formatMessage('Select the publishing profile you’d like to add a Microsoft App ID and Password from.'),
+    title: formatMessage('Retrieve App ID from publishing profile'),
+    subText: formatMessage(
+      'A publishing profile contains the information necessary to provision and publish your bot, including its App ID.'
+    ),
   };
 
   const handleAdd = () => {
@@ -106,7 +108,7 @@ export const GetAppInfoFromPublishProfileDialog: React.FC<Props> = (props) => {
       <DialogFooter>
         <PrimaryButton
           disabled={!!publishTargetsErrorMessage || !selectedKey}
-          text={formatMessage('Add App ID and Password')}
+          text={formatMessage('Save App ID')}
           onClick={handleAdd}
         />
         <DefaultButton text={formatMessage('Cancel')} onClick={onCancel} />
diff --git a/Composer/packages/client/src/pages/botProject/RootBotExternalService.tsx b/Composer/packages/client/src/pages/botProject/RootBotExternalService.tsx
index ee1f9d6bda..0eabd55d6c 100644
--- a/Composer/packages/client/src/pages/botProject/RootBotExternalService.tsx
+++ b/Composer/packages/client/src/pages/botProject/RootBotExternalService.tsx
@@ -336,10 +336,10 @@ export const RootBotExternalService: React.FC<RootBotExternalServiceProps> = (pr
 
   return (
     <Fragment>
-      <div css={title}>{formatMessage('Language Understanding')}</div>
+      <div css={title}>{formatMessage('Azure Language Understanding')}</div>
       <div css={subtext}>
         {formatMessage.rich(
-          '<a>Language Understanding Intelligent Service (LUIS)</a> is a machine learning-driven recognition service that enables advanced conversational capabilities. If you already have LUIS keys you’d like to use, you can paste them below. To fetch existing keys from Azure or create new keys, you can click “Get LUIS keys”. <a2>Learn more</a2>.',
+          'Language Understanding (LUIS) is an Azure Cognitive Service that uses machine learning to understand natural language input and direct the conversation flow. <a>Learn more.</a> Use an existing Language Understanding (LUIS) key from Azure or create a new key. <a2>Learn more</a2>.',
           {
             a: ({ children }) => (
               <Link key="luis-root-bot-settings-page" href={'https://www.luis.ai/'} target="_blank">
@@ -360,11 +360,11 @@ export const RootBotExternalService: React.FC<RootBotExternalServiceProps> = (pr
       </div>
       <div css={externalServiceContainerStyle}>
         <TextField
-          ariaLabel={formatMessage('LUIS application name')}
+          ariaLabel={formatMessage('Application name')}
           data-testid={'rootLUISApplicationName'}
           id={'luisName'}
-          label={formatMessage('LUIS application name')}
-          placeholder={formatMessage('Enter LUIS application name')}
+          label={formatMessage('Application name')}
+          placeholder={formatMessage('Type application name')}
           styles={inputFieldStyles}
           value={localRootLuisName}
           onBlur={handleRootLUISNameOnBlur}
@@ -373,12 +373,12 @@ export const RootBotExternalService: React.FC<RootBotExternalServiceProps> = (pr
         />
         <div ref={luisKeyFieldRef}>
           <TextField
-            ariaLabel={formatMessage('LUIS authoring key')}
+            ariaLabel={formatMessage('Language Understanding authoring key')}
             data-testid={'rootLUISAuthoringKey'}
             errorMessage={isLUISKeyNeeded ? errorElement(luisKeyErrorMsg) : ''}
             id={'luisAuthoringKey'}
-            label={formatMessage('LUIS authoring key')}
-            placeholder={formatMessage('Enter LUIS authoring key')}
+            label={formatMessage('Language Understanding authoring key')}
+            placeholder={formatMessage('Type Language Understanding authoring key')}
             required={isLUISKeyNeeded}
             styles={inputFieldStyles}
             value={localRootLuisKey}
@@ -389,12 +389,12 @@ export const RootBotExternalService: React.FC<RootBotExternalServiceProps> = (pr
         </div>
         <div ref={luisRegionFieldRef}>
           <Dropdown
-            ariaLabel={formatMessage('LUIS region')}
+            ariaLabel={formatMessage('Language Understanding region')}
             data-testid={'rootLUISRegion'}
             id={'luisRegion'}
-            label={formatMessage('LUIS region')}
+            label={formatMessage('Language Understanding region')}
             options={LUIS_REGIONS}
-            placeholder={formatMessage('Enter LUIS region')}
+            placeholder={formatMessage('Select region')}
             required={isLUISKeyNeeded}
             selectedKey={localRootLuisRegion}
             styles={inputFieldStyles}
@@ -411,8 +411,8 @@ export const RootBotExternalService: React.FC<RootBotExternalServiceProps> = (pr
         </div>
         <PrimaryButton
           disabled={displayManageLuis || displayManageQNA}
-          styles={{ root: { width: '130px', marginTop: '15px' } }}
-          text={formatMessage('Get LUIS keys')}
+          styles={{ root: { width: '250px', marginTop: '15px' } }}
+          text={formatMessage('Set up Language Understanding')}
           onClick={() => {
             setDisplayManageLuis(true);
           }}
@@ -440,10 +440,10 @@ export const RootBotExternalService: React.FC<RootBotExternalServiceProps> = (pr
             )}
           </MessageBar>
         )}
-        <div css={title}>{formatMessage('QnA Maker')}</div>
+        <div css={title}>{formatMessage('Azure QnA Maker')}</div>
         <div css={subtext}>
           {formatMessage.rich(
-            'Integrate with <a>QnA Maker</a> to provide bot content from easy-to-manage knowledge bases. If you already have a QnA key you’d like to use, you can paste it below. To fetch an existing key from Azure or create a new key, you can click “Get QnA key”. <a2>Learn more</a2>.',
+            'QnA Maker is an Azure Cognitive services that can extract question-and-answer pairs from a website FAQ. <a>Learn more.</a> Use an existing key from Azure or create a new key. <a2>Learn more.</a2>',
             {
               a: ({ children }) => (
                 <Link key="qna-root-bot-settings-page" href={'https://www.qnamaker.ai/'} target="_blank">
@@ -469,7 +469,7 @@ export const RootBotExternalService: React.FC<RootBotExternalServiceProps> = (pr
             errorMessage={isQnAKeyNeeded ? errorElement(qnaKeyErrorMsg) : ''}
             id={'qnaKey'}
             label={formatMessage('QnA Maker Subscription key')}
-            placeholder={formatMessage('Enter QnA Maker Subscription key')}
+            placeholder={formatMessage('Type subscription key')}
             required={isQnAKeyNeeded}
             styles={inputFieldStyles}
             value={localRootQnAKey}
@@ -480,8 +480,8 @@ export const RootBotExternalService: React.FC<RootBotExternalServiceProps> = (pr
         </div>
         <PrimaryButton
           disabled={displayManageLuis || displayManageQNA}
-          styles={{ root: { width: '130px', marginTop: '15px' } }}
-          text={formatMessage('Get QnA key')}
+          styles={{ root: { width: '250px', marginTop: '15px' } }}
+          text={formatMessage('Set up QnA Maker')}
           onClick={() => {
             setDisplayManageQNA(true);
           }}
diff --git a/Composer/packages/client/src/pages/botProject/SkillBotExternalService.tsx b/Composer/packages/client/src/pages/botProject/SkillBotExternalService.tsx
index d55f08a576..da795c341c 100644
--- a/Composer/packages/client/src/pages/botProject/SkillBotExternalService.tsx
+++ b/Composer/packages/client/src/pages/botProject/SkillBotExternalService.tsx
@@ -139,10 +139,10 @@ export const SkillBotExternalService: React.FC<SkillBotExternalServiceProps> = (
 
   return (
     <Fragment>
-      <div css={title}>{formatMessage('Language Understanding')}</div>
+      <div css={title}>{formatMessage('Azure Language Understanding')}</div>
       <div css={subtext}>
         {formatMessage.rich(
-          '<a>Language Understanding Intelligent Service (LUIS)</a> is a machine learning-driven recognition service that enables advanced conversational capabilities. If you already have LUIS keys you’d like to use, you can paste them below. To fetch existing keys from Azure or create new keys, you can click “Get LUIS keys”. <a2>Learn more</a2>.',
+          'Language Understanding (LUIS) is an Azure Cognitive Service that uses machine learning to understand natural language input and direct the conversation flow. <a>Learn more.</a> Use an existing Language Understanding (LUIS) key from Azure or create a new key. <a2>Learn more</a2>.',
           {
             a: ({ children }) => (
               <Link key="luis-skill-settings-page" href={'https://www.luis.ai/'} target="_blank">
@@ -159,11 +159,11 @@ export const SkillBotExternalService: React.FC<SkillBotExternalServiceProps> = (
       </div>
       <div css={externalServiceContainerStyle}>
         <TextField
-          ariaLabel={formatMessage('LUIS application name')}
+          ariaLabel={formatMessage('Application name')}
           data-testid={'skillLUISApplicationName'}
           id={'luisName'}
-          label={formatMessage('LUIS application name')}
-          placeholder={formatMessage('Enter LUIS application name')}
+          label={formatMessage('Application name')}
+          placeholder={formatMessage('Type application name')}
           styles={{ root: { marginBottom: 10 } }}
           value={localSkillLuisName}
           onBlur={handleSkillLUISNameOnBlur}
@@ -171,12 +171,12 @@ export const SkillBotExternalService: React.FC<SkillBotExternalServiceProps> = (
         />
         <div ref={luisKeyFieldRef}>
           <FieldWithCustomButton
-            ariaLabel={formatMessage('LUIS authoring key')}
+            ariaLabel={formatMessage('Language Understanding authoring key')}
             buttonText={formatMessage('Use custom LUIS authoring key')}
             errorMessage={!rootLuisKey ? formatMessage('Root Bot LUIS authoring key is empty') : ''}
             id={'luisAuthoringKey'}
-            label={formatMessage('LUIS authoring key')}
-            placeholder={formatMessage('Enter LUIS authoring key')}
+            label={formatMessage('Language Understanding authoring key')}
+            placeholder={formatMessage('Type Language Understanding authoring key')}
             placeholderOnDisable={rootLuisKey}
             required={isLUISKeyNeeded}
             value={skillLuisKey}
@@ -185,22 +185,22 @@ export const SkillBotExternalService: React.FC<SkillBotExternalServiceProps> = (
         </div>
         <div ref={luisRegionFieldRef}>
           <FieldWithCustomButton
-            ariaLabel={formatMessage('LUIS region')}
+            ariaLabel={formatMessage('Language Understanding region')}
             buttonText={formatMessage('Use custom LUIS region')}
             errorMessage={!rootLuisRegion ? formatMessage('Root Bot LUIS region is empty') : ''}
-            label={formatMessage('LUIS region')}
+            label={formatMessage('Language Understanding region')}
             options={LUIS_REGIONS}
-            placeholder={formatMessage('Enter LUIS region')}
+            placeholder={formatMessage('Select region')}
             placeholderOnDisable={rootLuisRegion}
             required={isLUISKeyNeeded}
             value={skillLuisRegion}
             onBlur={handleLUISRegionOnBlur}
           />
         </div>
-        <div css={title}>{formatMessage('QnA Maker')}</div>
+        <div css={title}>{formatMessage('Azure QnA Maker')}</div>
         <div css={subtext}>
           {formatMessage.rich(
-            'Integrate with <a>QnA Maker</a> to provide bot content from easy-to-manage knowledge bases. If you already have a QnA key you’d like to use, you can paste it below. To fetch an existing key from Azure or create a new key, you can click “Get QnA key”. <a2>Learn more.</a2>',
+            'QnA Maker is an Azure Cognitive services that can extract question-and-answer pairs from a website FAQ. <a>Learn more.</a> Use an existing key from Azure or create a new key. <a2>Learn more.</a2>',
             {
               a: ({ children }) => (
                 <Link key="qna-skill-settings-page" href={'https://www.qnamaker.ai/'} target="_blank">
diff --git a/Composer/packages/client/src/pages/botProject/adapters/AdapterSection.tsx b/Composer/packages/client/src/pages/botProject/adapters/AdapterSection.tsx
index 4002f7fabf..4a4511fb34 100644
--- a/Composer/packages/client/src/pages/botProject/adapters/AdapterSection.tsx
+++ b/Composer/packages/client/src/pages/botProject/adapters/AdapterSection.tsx
@@ -30,7 +30,7 @@ const AdapterSection = ({ projectId, scrollToSectionId }: Props) => {
     <div ref={containerRef}>
       <div css={subtitle}>
         {formatMessage.rich(
-          'Expand the reach of your bot by adding connections. Connections are added per bot (typically to the root bot, if your project contains multiple bots), as well as per publishing profile. Select a publishing profile to add and enable connections. <a>Learn more.</a>',
+          'Add connections to make your bot available in Webchat, Direct Line Speech, Microsoft Teams and more. <a>Learn more.</a>',
           {
             a: ({ children }) => (
               <Link key="adapters-settings-page" href={'https://aka.ms/composer-connections-learnmore'} target="_blank">
diff --git a/Composer/packages/client/src/pages/botProject/runtime-settings/RuntimeSettings.tsx b/Composer/packages/client/src/pages/botProject/runtime-settings/RuntimeSettings.tsx
index 965e37bae6..a839f74e4e 100644
--- a/Composer/packages/client/src/pages/botProject/runtime-settings/RuntimeSettings.tsx
+++ b/Composer/packages/client/src/pages/botProject/runtime-settings/RuntimeSettings.tsx
@@ -142,9 +142,7 @@ export const RuntimeSettings: React.FC<RouteComponentProps<{ projectId: string }
 
   const header = () => (
     <div css={subtext}>
-      {formatMessage(
-        'Configure Composer to start your bot using runtime code you can customize and control. Leave the field below blank if you don’t require customization.'
-      )}
+      {formatMessage('Configure the command used by Composer to start your bot application when testing locally.')}
     </div>
   );
 

From 2184addf228f7434c6aa320f81c2a14e16a50406 Mon Sep 17 00:00:00 2001
From: Ben Brown <benbro@microsoft.com>
Date: Tue, 4 May 2021 15:44:13 -0500
Subject: [PATCH 06/11] casing

---
 .../client/src/components/GetStarted/GetStartedNextSteps.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Composer/packages/client/src/components/GetStarted/GetStartedNextSteps.tsx b/Composer/packages/client/src/components/GetStarted/GetStartedNextSteps.tsx
index 923875cfe7..d557d0a436 100644
--- a/Composer/packages/client/src/components/GetStarted/GetStartedNextSteps.tsx
+++ b/Composer/packages/client/src/components/GetStarted/GetStartedNextSteps.tsx
@@ -273,7 +273,7 @@ export const GetStartedNextSteps: React.FC<GetStartedProps> = (props) => {
       },
       {
         key: 'insights',
-        label: formatMessage('Enable App insights'),
+        label: formatMessage('Enable App Insights'),
         description: formatMessage('Collect information about the use and performance of your bot.'),
         learnMore: 'https://aka.ms/composer-getstarted-enableinsights',
         checked: false,

From fa88d0e2b138744cf21178717851524ce02bcff5 Mon Sep 17 00:00:00 2001
From: Ben Brown <benbro@microsoft.com>
Date: Tue, 4 May 2021 16:05:24 -0500
Subject: [PATCH 07/11] address comments

---
 .../client/src/components/ManageService/ManageService.tsx       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Composer/packages/client/src/components/ManageService/ManageService.tsx b/Composer/packages/client/src/components/ManageService/ManageService.tsx
index b0a55192b6..079bc063d6 100644
--- a/Composer/packages/client/src/components/ManageService/ManageService.tsx
+++ b/Composer/packages/client/src/components/ManageService/ManageService.tsx
@@ -844,7 +844,7 @@ export const ManageService = (props: ManageServiceProps) => {
         setDialogTitle(formatMessage('Create {service} resources', { service: props.serviceName }));
         break;
     }
-  }, [currentStep]);
+  }, [currentStep, props.serviceName]);
 
   return (
     <Fragment>

From 6f48af52dcef108e60bfe6cdab0ed5b7f9688f7a Mon Sep 17 00:00:00 2001
From: Ben Brown <benbro@microsoft.com>
Date: Tue, 4 May 2021 16:14:42 -0500
Subject: [PATCH 08/11] update locale

---
 .../packages/server/src/locales/en-US.json    | 391 +++++++++---------
 1 file changed, 194 insertions(+), 197 deletions(-)

diff --git a/Composer/packages/server/src/locales/en-US.json b/Composer/packages/server/src/locales/en-US.json
index 435a179d99..38fedc8c72 100644
--- a/Composer/packages/server/src/locales/en-US.json
+++ b/Composer/packages/server/src/locales/en-US.json
@@ -2,8 +2,8 @@
   "0_bytes_a1e1cdb3": {
     "message": "0 Bytes"
   },
-  "1_using_the_azure_portal_please_create_a_language__5aa05fd6": {
-    "message": "1. Using the Azure portal, please create a Language Understanding resource on my behalf.\n2. Once provisioned, securely share the resulting credentials with me as described in the link below.\n\nDetailed instructions:\nhttps://aka.ms/bfcomposerhandoffluis"
+  "1_using_the_azure_portal_please_create_a_language__7e2eb65c": {
+    "message": "1. Using the Azure portal, please create a Language Understanding resource.\n2. Once created, securely share the resulting credentials with me as described in the link below.\n\nDetailed instructions:\nhttps://aka.ms/bfcomposerhandoffluis"
   },
   "1_using_the_azure_portal_please_create_a_qnamaker__a060ac82": {
     "message": "1. Using the Azure portal, please create a QnAMaker resource on my behalf.\n2. Once provisioned, securely share the resulting credentials with me as described in the link below.\n\nDetailed instructions:\nhttps://aka.ms/bfcomposerhandoffqnamaker"
@@ -32,9 +32,6 @@
   "a_knowledge_base_name_cannot_contain_spaces_or_spe_91dd53ac": {
     "message": "A knowledge base name cannot contain spaces or special characters. Use letters, numbers, -, or _."
   },
-  "a_language_understanding_intelligent_service_luis__348b281": {
-    "message": "<a>Language Understanding Intelligent Service (LUIS)</a> is a machine learning-driven recognition service that enables advanced conversational capabilities. If you already have LUIS keys you’d like to use, you can paste them below. To fetch existing keys from Azure or create new keys, you can click “Get LUIS keys”. <a2>Learn more</a2>."
-  },
   "a_minimap_gives_an_overview_of_your_source_code_fo_9a897f4f": {
     "message": "A minimap gives an overview of your source code for quick navigation and code understanding."
   },
@@ -47,6 +44,12 @@
   "a_property_is_a_piece_of_information_that_your_bot_eccd34bf": {
     "message": "A property is a piece of information that your bot will collect. The property name is the name used in Composer; it is not necessarily the same text that will appear in your bot''s messages."
   },
+  "a_publishing_profile_contains_the_information_nece_fffc0a35": {
+    "message": "A publishing profile contains the information necessary to provision and publish your bot, including its App ID."
+  },
+  "a_publishing_profile_provides_the_secure_connectiv_860d7d48": {
+    "message": "A publishing profile provides the secure connectivity required to publish your bot."
+  },
   "a_publishing_profile_provides_the_secure_connectiv_e203980e": {
     "message": "A publishing profile provides the secure connectivity required to publish your bot. "
   },
@@ -146,9 +149,6 @@
   "add_a_dialog_e378aa3a": {
     "message": "Add a dialog"
   },
-  "add_a_luis_key_7702f550": {
-    "message": "Add a LUIS key"
-  },
   "add_a_new_key_5c208c29": {
     "message": "Add a new key"
   },
@@ -161,18 +161,12 @@
   "add_a_package_2857cc9": {
     "message": "Add a package"
   },
-  "add_a_qna_maker_key_fbb94d93": {
-    "message": "Add a QnA Maker key"
-  },
   "add_a_skill_46d2b71c": {
     "message": "Add a skill"
   },
   "add_a_skill_host_endpoint_so_your_skills_can_relia_950a7614": {
     "message": "Add a skill host endpoint so your skills can reliably connect to your root bot. <a>Learn more</a>."
   },
-  "add_a_trigger_c6861401": {
-    "message": "Add a trigger"
-  },
   "add_allowed_callers_7188d3d4": {
     "message": "Add allowed callers"
   },
@@ -182,12 +176,12 @@
   "add_an_existing_bot_5a9cc5b1": {
     "message": "Add an existing bot"
   },
-  "add_app_id_and_password_164e0fdb": {
-    "message": "Add App ID and Password"
-  },
   "add_connections_d720a32e": {
     "message": "Add connections"
   },
+  "add_connections_to_make_your_bot_available_in_webc_5ae0b1de": {
+    "message": "Add connections to make your bot available in Webchat, Direct Line Speech, Microsoft Teams and more. <a>Learn more.</a>"
+  },
   "add_custom_a376ce51": {
     "message": "Add Custom"
   },
@@ -197,9 +191,6 @@
   "add_entity_5f769994": {
     "message": "Add entity"
   },
-  "add_from_publishing_profile_a672094f": {
-    "message": "Add from publishing profile"
-  },
   "add_microsoft_app_ids_of_bots_that_can_access_this_7d41742c": {
     "message": "Add Microsoft App Ids of bots that can access this skill. You can skip this step and add this information later from the project settings tab."
   },
@@ -224,9 +215,6 @@
   "add_new_extension_19b82b77": {
     "message": "Add new extension"
   },
-  "add_new_knowledge_base_1a3afed3": {
-    "message": "Add new knowledge base"
-  },
   "add_new_propertyname_bedf7dc6": {
     "message": "Add new { propertyName }"
   },
@@ -236,6 +224,9 @@
   "add_new_question_85612b7f": {
     "message": "Add new question"
   },
+  "add_new_trigger_dc8e80b4": {
+    "message": "Add new trigger"
+  },
   "add_new_validation_rule_here_eb675ccf": {
     "message": "Add new validation rule here"
   },
@@ -248,6 +239,9 @@
   "add_property_d381eba3": {
     "message": "Add Property"
   },
+  "add_qna_maker_knowledge_base_c1b27b78": {
+    "message": "Add QnA Maker knowledge base"
+  },
   "add_qna_pair_16c228f0": {
     "message": "+ Add QnA Pair"
   },
@@ -278,8 +272,8 @@
   "almost_there_f90939cb": {
     "message": "Almost there!"
   },
-  "an_app_id_is_used_for_communication_between_your_b_9bed41ac": {
-    "message": "An App ID is used for communication between your bot and skills, services, websites or applications. An App ID is created when you provision resources for your bot. If you’ve created an App ID already, you can use that ID instead. <a>Learn more.</a>"
+  "an_app_id_is_used_for_communication_between_your_b_1763a926": {
+    "message": "An App ID is used for communication between your bot and skills, services, websites or applications. Use an existing App ID or automatically generate an App ID when creating a publishing profile for this bot. <a>Learn more.</a>"
   },
   "an_authoring_key_is_created_automatically_when_you_21cf77aa": {
     "message": "An authoring key is created automatically when you create a LUIS account."
@@ -338,6 +332,9 @@
   "application_language_settings_85b1f06": {
     "message": "Application language settings"
   },
+  "application_name_67a279e2": {
+    "message": "Application name"
+  },
   "application_settings_39e840c6": {
     "message": "Application Settings"
   },
@@ -443,6 +440,18 @@
   "azure_functions_runtime_not_installed_bc24e100": {
     "message": "Azure Functions runtime not installed."
   },
+  "azure_language_understanding_5fc42020": {
+    "message": "Azure Language Understanding"
+  },
+  "azure_qna_maker_fd153eb7": {
+    "message": "Azure QnA Maker"
+  },
+  "azure_resource_group_cee486e6": {
+    "message": "Azure resource group"
+  },
+  "azure_subscription_4671d043": {
+    "message": "Azure subscription"
+  },
   "azure_web_app_d834cb4c": {
     "message": "Azure Web App"
   },
@@ -533,9 +542,6 @@
   "bot_language_active_7cf9dc78": {
     "message": "Bot language (active)"
   },
-  "bot_management_and_configurations_b7dadd69": {
-    "message": "Bot management and configurations"
-  },
   "bot_name_cannot_start_with_a_number_or_space_3a5c6fc1": {
     "message": "Bot name cannot start with a number or space"
   },
@@ -545,6 +551,9 @@
   "bot_project_file_does_not_exist_a0864a2c": {
     "message": "Bot project file does not exist."
   },
+  "bot_project_location_3be47459": {
+    "message": "Bot project location"
+  },
   "bot_projects_settings_list_view_ab58e5d": {
     "message": "Bot projects settings list View"
   },
@@ -575,6 +584,9 @@
   "break_out_of_loop_ab30157c": {
     "message": "Break out of loop"
   },
+  "build_a_continuous_integration_and_deployment_ci_c_79188c70": {
+    "message": "Build a continuous integration and deployment (CI/CD) pipeline with Azure Resource Manager templates."
+  },
   "building_5e8a3c1d": {
     "message": "Building"
   },
@@ -629,9 +641,6 @@
   "choose_a_location_for_your_new_bot_project_e979f2d5": {
     "message": "Choose a location for your new bot project."
   },
-  "choose_from_existing_e85a88c4": {
-    "message": "Choose from existing"
-  },
   "choose_how_to_create_your_bot_a97f7b3e": {
     "message": "Choose how to create your bot"
   },
@@ -668,8 +677,8 @@
   "collapse_navigation_17228b95": {
     "message": "Collapse Navigation"
   },
-  "collect_service_level_and_conversation_level_data__d486b519": {
-    "message": "Collect service-level and conversation-level data to help gauge the performance and efficacy of your bot."
+  "collect_information_about_the_use_and_performance__39c61db9": {
+    "message": "Collect information about the use and performance of your bot."
   },
   "comment_7ef1428e": {
     "message": "Comment"
@@ -737,12 +746,15 @@
   "configure_and_publish_7f53bc9a": {
     "message": "Configure and publish"
   },
-  "configure_composer_to_start_your_bot_using_runtime_780aa8fa": {
-    "message": "Configure Composer to start your bot using runtime code you can customize and control. Leave the field below blank if you don’t require customization."
-  },
   "configure_ecb97e30": {
     "message": "Configure"
   },
+  "configure_the_command_used_by_composer_to_start_yo_f4231dc6": {
+    "message": "Configure the command used by Composer to start your bot application when testing locally."
+  },
+  "configure_your_bot_7483e4a": {
+    "message": "Configure your bot"
+  },
   "configures_default_language_model_to_use_if_there__f09f1acd": {
     "message": "Configures default language model to use if there is no culture code in the file name (Default: en-us)"
   },
@@ -830,9 +842,6 @@
   "copy_9748f9f": {
     "message": "Copy"
   },
-  "copy_and_share_this_information_with_your_azure_ad_68be5396": {
-    "message": "Copy and share this information with your Azure admin to provision resources on your behalf."
-  },
   "copy_content_for_translation_7affbcbb": {
     "message": "Copy content for translation"
   },
@@ -878,9 +887,6 @@
   "create_a_new_form_dialog_schema_by_clicking_above_34b80531": {
     "message": "Create a new form dialog schema by clicking + above."
   },
-  "create_a_new_service_resource_23d59c2f": {
-    "message": "Create a new { service } resource"
-  },
   "create_a_publish_profile_to_continue_1e2fa5a0": {
     "message": "Create a publish profile to continue"
   },
@@ -893,12 +899,18 @@
   "create_a_trigger_40e74743": {
     "message": "Create a trigger"
   },
+  "create_and_configure_new_azure_resources_302c574a": {
+    "message": "Create and configure new Azure resources"
+  },
   "create_bot_from_template_or_scratch_92f0fefa": {
     "message": "Create bot from template or scratch?"
   },
   "create_copy_to_translate_bot_content_efc872c": {
     "message": "Create copy to translate bot content"
   },
+  "create_custom_knowledge_base_e1cad195": {
+    "message": "Create custom knowledge base"
+  },
   "create_folder_error_38aa86f5": {
     "message": "Create Folder Error"
   },
@@ -917,12 +929,6 @@
   "create_from_template_87e12c94": {
     "message": "Create from template"
   },
-  "create_knowledge_base_db6d66c4": {
-    "message": "Create knowledge base"
-  },
-  "create_knowledge_base_from_scratch_afe4d2a2": {
-    "message": "Create knowledge base from scratch"
-  },
   "create_new_e0946c49": {
     "message": "Create new"
   },
@@ -932,27 +938,24 @@
   "create_new_kb_1c4f86a0": {
     "message": "Create new KB"
   },
-  "create_new_knowledge_base_d15d6873": {
-    "message": "Create new knowledge base"
-  },
   "create_new_publish_profile_e27c0950": {
     "message": "Create new publish profile"
   },
-  "create_new_service_resource_ce813150": {
-    "message": "Create new { service } resource"
+  "create_service_resources_386ef96b": {
+    "message": "Create { service } resources"
   },
   "create_your_first_bot_a23748c1": {
     "message": "Create your first bot"
   },
+  "creating_knowledge_base_e391b132": {
+    "message": "Creating knowledge base..."
+  },
   "creating_qna_maker_7c88df84": {
     "message": "Creating QnA Maker"
   },
   "creating_resources_af3aec2f": {
     "message": "Creating resources..."
   },
-  "creating_your_knowledge_base_ef4f9872": {
-    "message": "Creating your knowledge base"
-  },
   "current_40c0812f": {
     "message": " - Current"
   },
@@ -968,9 +971,6 @@
   "custom_runtime_426aa34f": {
     "message": "Custom runtime"
   },
-  "customize_your_bot_by_editing_and_adding_bot_respo_1bdc3dcb": {
-    "message": "Customize your bot by editing and adding bot responses."
-  },
   "cut_c8c92681": {
     "message": "Cut"
   },
@@ -1028,6 +1028,12 @@
   "define_new_entity_6c69b912": {
     "message": "Define new entity"
   },
+  "define_user_input_and_trigger_phrases_to_direct_th_d473c5c": {
+    "message": "Define user input and trigger phrases to direct the conversation flow."
+  },
+  "define_your_bot_s_responses_add_phrase_variations__11aa55cb": {
+    "message": "Define your bot''s responses, add phrase variations, execute simple expressions based on context, or refer to conversational memory."
+  },
   "defined_in_475568fb": {
     "message": "Defined in:"
   },
@@ -1085,8 +1091,8 @@
   "design_51b2812a": {
     "message": "Design"
   },
-  "development_resources_e5c7c3d5": {
-    "message": "Development Resources"
+  "development_resources_67364176": {
+    "message": "Development resources"
   },
   "diagnostic_description_msg_9ddd1be": {
     "message": "Diagnostic Description { msg }"
@@ -1256,6 +1262,9 @@
   "edit_array_c56a18cc": {
     "message": "Edit array"
   },
+  "edit_bot_responses_34bd1a28": {
+    "message": "Edit bot responses"
+  },
   "edit_c5fbea07": {
     "message": "Edit"
   },
@@ -1295,8 +1304,8 @@
   "edit_this_template_in_a_bot_response_view_a_7236985f": {
     "message": "Edit this template in<a>Bot Response view</a>"
   },
-  "edit_what_your_bot_says_7c2ca21e": {
-    "message": "Edit what your bot says"
+  "edit_user_input_and_triggers_333c9a0e": {
+    "message": "Edit user input and triggers"
   },
   "ejecting_runtime_f6c90614": {
     "message": "Ejecting runtime..."
@@ -1322,8 +1331,8 @@
   "enable_6f5d1328": {
     "message": "Enable"
   },
-  "enable_insights_e339cf40": {
-    "message": "Enable Insights"
+  "enable_app_insights_99b6c116": {
+    "message": "Enable App Insights"
   },
   "enable_line_numbers_to_refer_to_code_lines_by_numb_e5ba66ea": {
     "message": "Enable line numbers to refer to code lines by number."
@@ -1364,9 +1373,6 @@
   "endpoints_ff946539": {
     "message": "Endpoints"
   },
-  "ensure_your_bot_can_understand_your_users_by_frequ_c3f5c722": {
-    "message": "Ensure your bot can understand your users by frequently training your LUIS model."
-  },
   "enter_a_manifest_url_to_add_a_new_skill_to_your_bo_eb966c95": {
     "message": "Enter a manifest URL to add a new skill to your bot."
   },
@@ -1376,12 +1382,6 @@
   "enter_a_min_value_c3030813": {
     "message": "Enter a min value"
   },
-  "enter_a_url_7b4d6063": {
-    "message": "Enter a URL"
-  },
-  "enter_a_url_or_browse_to_upload_a_file_88a783fa": {
-    "message": "Enter a URL or browse to upload a file "
-  },
   "enter_a_url_to_import_qna_resource_223ded92": {
     "message": "Enter a URL to Import QnA resource"
   },
@@ -1391,21 +1391,6 @@
   "enter_cognitive_services_key_b78e4b55": {
     "message": "Enter cognitive services key"
   },
-  "enter_luis_application_name_df312e75": {
-    "message": "Enter LUIS application name"
-  },
-  "enter_luis_authoring_key_c59f8f1f": {
-    "message": "Enter LUIS authoring key"
-  },
-  "enter_luis_region_2316eceb": {
-    "message": "Enter LUIS region"
-  },
-  "enter_microsoft_app_id_c92101b0": {
-    "message": "Enter Microsoft App Id"
-  },
-  "enter_microsoft_app_password_b0926c39": {
-    "message": "Enter Microsoft App Password"
-  },
   "enter_name_for_new_resource_group_96fe8ea8": {
     "message": "Enter name for new resource group"
   },
@@ -1415,9 +1400,6 @@
   "enter_qna_maker_subscription_key_d26b4bad": {
     "message": "Enter QnA Maker Subscription key"
   },
-  "enter_region_94d11bd": {
-    "message": "Enter region"
-  },
   "enter_skill_host_endpoint_url_7489a83f": {
     "message": "Enter Skill host endpoint URL"
   },
@@ -1523,9 +1505,6 @@
   "expand_navigation_20330d1d": {
     "message": "Expand Navigation"
   },
-  "expand_the_reach_of_your_bot_by_adding_connections_631c52d3": {
-    "message": "Expand the reach of your bot by adding connections. Connections are added per bot (typically to the root bot, if your project contains multiple bots), as well as per publishing profile. Select a publishing profile to add and enable connections. <a>Learn more.</a>"
-  },
   "expected_responses_1dca1864": {
     "message": "Expected responses"
   },
@@ -1547,6 +1526,9 @@
   "expression_to_evaluate_ce4095b1": {
     "message": "Expression to evaluate."
   },
+  "extend_your_bot_with_reusable_dialogs_bot_response_64f9ca51": {
+    "message": "Extend your bot with reusable dialogs, bot response templates and custom actions."
+  },
   "extension_settings_899ccb55": {
     "message": "Extension Settings"
   },
@@ -1559,11 +1541,8 @@
   "extract_question_and_answer_pairs_from_an_online_f_7316548e": {
     "message": "Extract question-and-answer pairs from an online FAQ, product manuals, or other files. Supported formats are .tsv, .pdf, .doc, .docx, .xlsx, containing questions and answers in sequence. Learn more about knowledge base sources. Skip this step to add questions and answers manually after creation. The number of sources and file size you can add depends on the QnA service SKU you choose. Learn more about QnA Maker SKUs."
   },
-  "extract_question_and_answer_pairs_from_an_online_f_c1e12724": {
-    "message": "Extract question-and-answer pairs from an online FAQ, product manuals, or other files. Supported formats are .tsv, .pdf, .doc, .docx, .xlsx, containing questions and answers in sequence. "
-  },
-  "extracting_qna_pairs_from_url_b0331bba": {
-    "message": "Extracting QNA pairs from { url }"
+  "extracting_question_and_answer_pairs_from_url_bb3f73bb": {
+    "message": "Extracting question-and-answer pairs from { url }"
   },
   "fail_to_save_bot_578fa8aa": {
     "message": "Fail to save bot"
@@ -1577,6 +1556,9 @@
   "false_eef8c169": {
     "message": "False"
   },
+  "faq_website_source_47b5c924": {
+    "message": "FAQ website (source)"
+  },
   "fetching_form_dialog_schema_templates_failed_44e2dd63": {
     "message": "Fetching form dialog schema templates failed."
   },
@@ -1586,9 +1568,6 @@
   "fields_must_be_either_all_strings_or_all_fieldset__d3df28c": {
     "message": "fields must be either all strings or all fieldset objects"
   },
-  "file_location_9258afd3": {
-    "message": "File Location"
-  },
   "file_name_8fd421ff": {
     "message": "File name"
   },
@@ -1709,6 +1688,9 @@
   "generate_dialog_b80a85b2": {
     "message": "Generate dialog"
   },
+  "generate_instructions_for_azure_administrator_1cb21884": {
+    "message": "Generate instructions for Azure administrator"
+  },
   "generating_dialog_for_schemaid_51b2744f": {
     "message": "Generating dialog for \"{ schemaId }\""
   },
@@ -1733,12 +1715,6 @@
   "get_conversation_members_71602275": {
     "message": "Get conversation members"
   },
-  "get_luis_keys_4cbb975c": {
-    "message": "Get LUIS keys"
-  },
-  "get_qna_key_583b2548": {
-    "message": "Get QnA key"
-  },
   "get_remote_file_fail_37ef94c5": {
     "message": "get remote file fail"
   },
@@ -1775,9 +1751,6 @@
   "handoff_activity_14363a20": {
     "message": "Handoff activity"
   },
-  "handoff_to_admin_c104b028": {
-    "message": "Handoff to admin"
-  },
   "handover_to_human_1a619574": {
     "message": "Handover to human"
   },
@@ -1802,8 +1775,8 @@
   "http_request_b6394895": {
     "message": "HTTP request"
   },
-  "i_am_working_on_a_microsoft_bot_framework_project__f22ad8ee": {
-    "message": "I am working on a Microsoft Bot Framework project, and I now require some Azure resources to be created. Please follow the instructions below to create these resources and provide them to me.\n\n{ instructions }"
+  "i_am_creating_a_conversational_experience_using_mi_d4519e24": {
+    "message": "I am creating a conversational experience using Microsoft Bot Framework project. For my project to work, it needs Azure resources including { service }. Below are the steps to create these resources.\n\n{ instructions }"
   },
   "i_want_to_keep_the_template_content_in_the_file_ju_769331d9": {
     "message": "I want to keep the template content in the file, just want to dereference from this response (hint: keep the content if you currently, or plan to re-use in another location)"
@@ -1817,6 +1790,9 @@
   "id_already_exists_please_enter_a_unique_file_name_174913a3": {
     "message": "{ id } already exists. Please enter a unique file name."
   },
+  "if_azure_resources_and_subscription_are_managed_by_e36717f6": {
+    "message": "If Azure resources and subscription are managed by others, use the following information to request creation of the resources that you need to build and run your bot."
+  },
   "if_condition_d4383ce9": {
     "message": "If condition"
   },
@@ -1883,9 +1859,6 @@
   "input_hint_ab89f368": {
     "message": "Input hint"
   },
-  "input_your_details_below_to_create_a_new_service_r_ad2cbd2f": {
-    "message": "Input your details below to create a new { service } resource. You will be able to manage your new resource in the Azure portal."
-  },
   "insert_a_property_reference_in_memory_95d27746": {
     "message": "Insert a property reference in memory"
   },
@@ -1952,12 +1925,6 @@
   "integer_or_expression_107f60fb": {
     "message": "Integer or expression"
   },
-  "integrate_with_a_qna_maker_a_to_provide_bot_conten_2e143ac3": {
-    "message": "Integrate with <a>QnA Maker</a> to provide bot content from easy-to-manage knowledge bases. If you already have a QnA key you’d like to use, you can paste it below. To fetch an existing key from Azure or create a new key, you can click “Get QnA key”. <a2>Learn more.</a2>"
-  },
-  "integrate_with_a_qna_maker_a_to_provide_bot_conten_e379948e": {
-    "message": "Integrate with <a>QnA Maker</a> to provide bot content from easy-to-manage knowledge bases. If you already have a QnA key you’d like to use, you can paste it below. To fetch an existing key from Azure or create a new key, you can click “Get QnA key”. <a2>Learn more</a2>."
-  },
   "integrating_with_power_virtual_agents_14c007cf": {
     "message": "Integrating with Power Virtual Agents"
   },
@@ -2024,18 +1991,12 @@
   "keys_must_be_unique_2028cef3": {
     "message": "Keys must be unique"
   },
-  "knowledge_base_31e6868e": {
-    "message": "Knowledge base"
-  },
   "knowledge_base_name_7d83bbe4": {
     "message": "Knowledge base name"
   },
   "knowledge_qna_1a599dcf": {
     "message": "Knowledge (QnA)"
   },
-  "knowledge_source_dd66f38f": {
-    "message": "Knowledge source"
-  },
   "l_startline_startcharacter_l_endline_endcharacter_72bc2e5d": {
     "message": "L{ startLine }:{ startCharacter } - L{ endLine }:{ endCharacter } "
   },
@@ -2048,6 +2009,15 @@
   "language_understanding_9ae3f1f6": {
     "message": "Language Understanding"
   },
+  "language_understanding_authoring_key_74a41a4": {
+    "message": "Language Understanding authoring key"
+  },
+  "language_understanding_luis_is_an_azure_cognitive__5181510f": {
+    "message": "Language Understanding (LUIS) is an Azure Cognitive Service that uses machine learning to understand natural language input and direct the conversation flow. <a>Learn more.</a> Use an existing Language Understanding (LUIS) key from Azure or create a new key. <a2>Learn more</a2>."
+  },
+  "language_understanding_region_ec8fb05c": {
+    "message": "Language Understanding region"
+  },
   "languagepolicy_e754ad28": {
     "message": "LanguagePolicy"
   },
@@ -2063,9 +2033,6 @@
   "learn_how_to_build_a_skill_b1c39c82": {
     "message": "learn how to build a skill"
   },
-  "learn_how_to_publish_to_a_dev_ops_pipeline_using_c_9b4577be": {
-    "message": "Learn how to publish to a Dev Ops pipeline using CI / CD."
-  },
   "learn_more_a79a7918": {
     "message": "Learn more"
   },
@@ -2075,9 +2042,6 @@
   "learn_more_about_endpoints_df156708": {
     "message": "Learn more about endpoints"
   },
-  "learn_more_about_knowledge_base_sources_24369b09": {
-    "message": "Learn more about knowledge base sources. "
-  },
   "learn_more_about_manifests_6e7c364b": {
     "message": "Learn more about manifests"
   },
@@ -2096,9 +2060,6 @@
   "learn_more_c08939e8": {
     "message": "Learn more."
   },
-  "learning_70e0f90b": {
-    "message": "Learning"
-  },
   "leave_product_tour_49585718": {
     "message": "Leave Product Tour?"
   },
@@ -2237,15 +2198,9 @@
   "luis_add4bbe3": {
     "message": "LUIS"
   },
-  "luis_application_name_1530d3aa": {
-    "message": "LUIS application name"
-  },
   "luis_authoring_key_2cfdf05": {
     "message": "LUIS authoring key:"
   },
-  "luis_authoring_key_c8414499": {
-    "message": "LUIS authoring key"
-  },
   "luis_authoring_key_is_required_with_the_current_re_464f655e": {
     "message": "LUIS authoring key is required with the current recognizer setting to start your bot locally, and publish"
   },
@@ -2255,9 +2210,6 @@
   "luis_key_is_required_with_the_current_recognizer_s_66890a29": {
     "message": "LUIS key is required with the current recognizer setting to start your bot locally, and publish"
   },
-  "luis_region_9879d8de": {
-    "message": "LUIS region"
-  },
   "luis_region_is_required_4b7a19af": {
     "message": "LUIS region is required"
   },
@@ -2486,9 +2438,6 @@
   "next_40e12421": {
     "message": "Next"
   },
-  "next_steps_fce2208": {
-    "message": "Next steps"
-  },
   "no_azure_directories_were_found_6dfe6f6f": {
     "message": "No Azure Directories were found."
   },
@@ -2810,6 +2759,9 @@
   "project_readme_68f88d88": {
     "message": "Project Readme"
   },
+  "project_readme_6f5488be": {
+    "message": "Project readme"
+  },
   "project_settings_42fe3f68": {
     "message": "Project settings"
   },
@@ -2906,9 +2858,6 @@
   "publish_target_388f6adf": {
     "message": "Publish target"
   },
-  "publish_to_dev_ops_3b8f5a2f": {
-    "message": "Publish to Dev Ops"
-  },
   "publish_your_bot_9099e323": {
     "message": "Publish your bot"
   },
@@ -2960,12 +2909,12 @@
   "qna_intent_recognized_6760e56d": {
     "message": "QnA intent recognized"
   },
-  "qna_maker_c313ed6e": {
-    "message": "QnA Maker"
-  },
   "qna_maker_introduction_c2e426a": {
     "message": "QnA Maker introduction"
   },
+  "qna_maker_is_an_azure_cognitive_services_that_can__77546394": {
+    "message": "QnA Maker is an Azure Cognitive services that can extract question-and-answer pairs from a website FAQ. <a>Learn more.</a> Use an existing key from Azure or create a new key. <a2>Learn more.</a2>"
+  },
   "qna_maker_subscription_key_a645be58": {
     "message": "QnA Maker subscription key:"
   },
@@ -3008,9 +2957,6 @@
   "re_prompt_for_input_reprompt_dialog_event_ba028f7": {
     "message": "Re-prompt for input (Reprompt dialog event)"
   },
-  "read_me_4734ca1": {
-    "message": "Read Me"
-  },
   "recent_f19e8c64": {
     "message": "Recent"
   },
@@ -3122,9 +3068,6 @@
   "reset_view_d5f8245a": {
     "message": "Reset view"
   },
-  "resource_group_59eac426": {
-    "message": "Resource group"
-  },
   "resource_group_982beb22": {
     "message": "Resource Group"
   },
@@ -3152,6 +3095,15 @@
   "restart_conversation_same_user_id_a0188cca": {
     "message": "Restart Conversation - same user ID"
   },
+  "retrieve_app_id_59f07cf4": {
+    "message": "Retrieve App ID"
+  },
+  "retrieve_app_id_from_publishing_profile_b6643a25": {
+    "message": "Retrieve App ID from publishing profile"
+  },
+  "review_and_configure_your_bot_s_resources_and_add__c0e30e9a": {
+    "message": "Review and configure your bot''s resources, and add new connections such as speech, Microsoft Teams and more."
+  },
   "review_and_generate_63dec712": {
     "message": "Review and generate"
   },
@@ -3206,6 +3158,9 @@
   "save_11a80ec3": {
     "message": "Save"
   },
+  "save_app_id_f64b6102": {
+    "message": "Save App ID"
+  },
   "save_your_skill_manifest_63bf5f26": {
     "message": "Save your skill manifest"
   },
@@ -3269,6 +3224,12 @@
   "select_a_publishing_profile_a2eb4e86": {
     "message": "Select a publishing profile"
   },
+  "select_a_resource_group_b536a26d": {
+    "message": "Select a resource group"
+  },
+  "select_a_subscription_446b44e6": {
+    "message": "Select a subscription"
+  },
   "select_a_template_874fe803": {
     "message": "Select a template"
   },
@@ -3308,17 +3269,26 @@
   "select_publishing_profile_a3f478e2": {
     "message": "Select publishing profile"
   },
+  "select_region_42a80a8e": {
+    "message": "Select region"
+  },
+  "select_resource_edaf4ef5": {
+    "message": "Select resource"
+  },
   "select_runtime_version_to_add_d63d383b": {
     "message": "Select runtime version to add"
   },
-  "select_service_key_6ca27e67": {
-    "message": "Select { service } key"
+  "select_service_resources_326b206a": {
+    "message": "Select { service } resources"
+  },
+  "select_subscription_c5678611": {
+    "message": "Select subscription"
   },
   "select_the_language_that_bot_will_be_able_to_under_1f2bcb96": {
     "message": "Select the language that bot will be able to understand (User input) and respond to (Bot responses).\n    To make this bot available in other languages, click “Add’ to create a copy of the default language, and translate the content into the new language."
   },
-  "select_the_publishing_profile_you_d_like_to_add_a__ffff34ac": {
-    "message": "Select the publishing profile you’d like to add a Microsoft App ID and Password from."
+  "select_the_resource_group_and_region_in_which_your_51f85ff": {
+    "message": "Select the resource group and region in which your { service } service will be created."
   },
   "select_which_dialogs_are_included_in_the_skill_man_281ef8c9": {
     "message": "Select which dialogs are included in the skill manifest"
@@ -3326,15 +3296,12 @@
   "select_which_tasks_this_skill_can_perform_172b0eae": {
     "message": "Select which tasks this skill can perform"
   },
-  "select_your_azure_directory_then_choose_the_subscr_69776814": {
-    "message": "Select your Azure directory, then choose the subscription where your existing resource is located and the keys you want to use. "
+  "select_your_azure_directory_then_choose_the_subscr_28e935bc": {
+    "message": "Select your Azure directory, then choose the subscription where your existing { service } resource is located. "
   },
   "select_your_azure_directory_then_choose_the_subscr_7034a3c0": {
     "message": "Select your Azure directory, then choose the subscription where you’d like your new { service } resource."
   },
-  "select_your_azure_directory_then_choose_the_subscr_e3d67edf": {
-    "message": "Select your Azure directory, then choose the subscription where you’d like your new { service } resource. "
-  },
   "selection_field_86d1dc94": {
     "message": "selection field"
   },
@@ -3353,8 +3320,8 @@
   "sentence_wrap_930c8ced": {
     "message": "Sentence wrap"
   },
-  "service_key_502b7dbd": {
-    "message": "{ service } Key"
+  "service_resource_name_56566aab": {
+    "message": "{ service } resource name"
   },
   "session_expired_12aaf414": {
     "message": "Session expired"
@@ -3371,8 +3338,17 @@
   "set_properties_7415af3c": {
     "message": "Set properties"
   },
-  "set_up_hosting_and_other_azure_resources_to_enable_2581b873": {
-    "message": "Set up hosting and other Azure resources to enable publishing"
+  "set_up_continuous_deployment_devops_4919f626": {
+    "message": "Set up continuous deployment (DevOps)"
+  },
+  "set_up_language_understanding_f51f4884": {
+    "message": "Set up Language Understanding"
+  },
+  "set_up_qna_maker_170a4422": {
+    "message": "Set up QnA Maker"
+  },
+  "set_up_service_b6d23e54": {
+    "message": "Set up { service }"
   },
   "setting_things_up_8022afe8": {
     "message": "Setting things up..."
@@ -3392,15 +3368,9 @@
   "settings_menu_c99ecc6d": {
     "message": "Settings menu"
   },
-  "setup_language_understanding_so_that_you_can_start_97addd86": {
-    "message": "Setup Language Understanding so that you can start and test your bot."
-  },
   "share_as_a_skill_63554df2": {
     "message": "Share as a skill"
   },
-  "share_resource_request_afc3e465": {
-    "message": "Share resource request"
-  },
   "short_description_for_6abb9a1b": {
     "message": "short description for"
   },
@@ -3428,8 +3398,8 @@
   "skill_9b084d2e": {
     "message": "Skill"
   },
-  "skill_configuration_ed35b038": {
-    "message": "Skill Configuration"
+  "skill_configuration_5e4bfbcd": {
+    "message": "Skill configuration"
   },
   "skill_dialog_name_1bbf0eff": {
     "message": "Skill Dialog Name"
@@ -3791,9 +3761,6 @@
   "this_option_allows_your_users_to_give_multiple_val_d2dd0d58": {
     "message": "This option allows your users to give multiple values for this property."
   },
-  "this_page_contains_detailed_information_about_your_224a2b04": {
-    "message": "This Page contains detailed information about your bot. For security reasons, they are hidden by default. To test your bot or publish to Azure, you may need to provide these settings."
-  },
   "this_publishing_profile_profilename_is_no_longer_s_eee0f447": {
     "message": "This publishing profile ({ profileName }) is no longer supported. You are a member of multiple Azure tenants and the profile needs to have a tenant id associated with it. You can either edit the profile by adding the `tenantId` property to it''s configuration or create a new one."
   },
@@ -3863,6 +3830,9 @@
   "to_run_this_bot_composer_needs_net_core_sdk_d1551038": {
     "message": "To run this bot, Composer needs .NET Core SDK."
   },
+  "to_understand_natural_language_input_and_direct_th_fc982d4a": {
+    "message": "To understand natural language input and direct the conversation flow, your bot needs a language understanding service. "
+  },
   "to_understand_what_the_user_says_your_dialog_needs_4e791611": {
     "message": "To understand what the user says, your dialog needs a \"Recognizer\"; that includes example words and sentences that users may use."
   },
@@ -3896,9 +3866,6 @@
   "total_plural_1_starting_bot_other_starting_bots_ru_3d173401": {
     "message": "{ total, plural,\n     =1 {Starting bot..}\n  other {Starting bots.. ({ running }/{ total } running)}\n}"
   },
-  "train_your_language_model_ee4cec6a": {
-    "message": "Train your language model"
-  },
   "trigger_f0ee1fbf": {
     "message": "Trigger"
   },
@@ -3932,6 +3899,15 @@
   "type_and_press_enter_33a2905d": {
     "message": "Type and press enter"
   },
+  "type_app_id_a37decdf": {
+    "message": "Type App Id"
+  },
+  "type_app_password_8084ff36": {
+    "message": "Type App Password"
+  },
+  "type_application_name_24f02dbe": {
+    "message": "Type application name"
+  },
   "type_c8106334": {
     "message": "Type"
   },
@@ -3941,6 +3917,15 @@
   "type_form_dialog_schema_name_b767985c": {
     "message": "Type form dialog schema name"
   },
+  "type_language_understanding_authoring_key_515790d0": {
+    "message": "Type Language Understanding authoring key"
+  },
+  "type_or_paste_url_763adeb4": {
+    "message": "Type or paste URL"
+  },
+  "type_subscription_key_ab5ab9a6": {
+    "message": "Type subscription key"
+  },
   "typing_activity_6b634ae": {
     "message": "Typing activity"
   },
@@ -4016,6 +4001,15 @@
   "url_should_start_with_http_or_https_c34632bb": {
     "message": "URL should start with http:// or https://"
   },
+  "use_azure_qna_maker_to_create_a_simple_question_an_a38d6770": {
+    "message": "Use Azure QnA Maker to create a simple question-and-answer bot from a website FAQ."
+  },
+  "use_azure_qna_maker_to_create_a_simple_question_an_b24bef9f": {
+    "message": "Use Azure QnA Maker to create a simple question-and-answer bot from a website FAQ. "
+  },
+  "use_azure_qna_maker_to_extract_question_and_answer_942c2dcd": {
+    "message": "Use Azure QnA Maker to extract question-and-answer pairs from an online FAQ. "
+  },
   "use_custom_luis_authoring_key_9c71470b": {
     "message": "Use custom LUIS authoring key"
   },
@@ -4028,6 +4022,15 @@
   "use_custom_runtime_d7d323fd": {
     "message": "Use custom runtime"
   },
+  "use_existing_resources_88d21106": {
+    "message": "Use existing resources"
+  },
+  "use_machine_learning_to_understand_natural_languag_53f12465": {
+    "message": "Use machine learning to understand natural language input and direct the conversation flow."
+  },
+  "use_speech_to_enable_voice_input_and_output_for_yo_742c511d": {
+    "message": "Use Speech to enable voice input and output for your bot."
+  },
   "used_3d895705": {
     "message": "Used"
   },
@@ -4082,15 +4085,12 @@
   "view_on_npm_2051324d": {
     "message": "View on npm"
   },
-  "view_project_readme_ff079d2e": {
-    "message": "View project readme"
+  "view_readme_37414cb9": {
+    "message": "View readme"
   },
   "visit_a_this_page_a_to_learn_more_about_entity_def_c7c862a9": {
     "message": "Visit <a>this page</a> to learn more about entity definition."
   },
-  "visit_the_package_manager_to_browse_packages_to_ad_d33c3659": {
-    "message": "Visit the Package manager to browse packages to add to your bot."
-  },
   "visual_editor_216472d": {
     "message": "Visual editor"
   },
@@ -4277,9 +4277,6 @@
   "your_teams_adapter_is_configured_for_your_publishe_e84e9275": {
     "message": "Your Teams adapter is configured for your published bot. Copy the manifest, open App Studio in Teams and add the manifest so you can test your bot in Teams"
   },
-  "your_template_requires_qna_maker_to_access_content_a4ca6f76": {
-    "message": "Your template requires QnA Maker to access content for your bot."
-  },
   "zoom_in_3205e865": {
     "message": "Zoom in"
   },

From 2f9a1fb215bfce2cdbc3cb73b2d923b4215141b0 Mon Sep 17 00:00:00 2001
From: Ben Brown <benbro@microsoft.com>
Date: Tue, 4 May 2021 16:55:55 -0500
Subject: [PATCH 09/11] fix test

---
 Composer/cypress/integration/DesignPage.spec.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Composer/cypress/integration/DesignPage.spec.ts b/Composer/cypress/integration/DesignPage.spec.ts
index aba97cfa47..47149e5fad 100644
--- a/Composer/cypress/integration/DesignPage.spec.ts
+++ b/Composer/cypress/integration/DesignPage.spec.ts
@@ -80,7 +80,7 @@ context('breadcrumb', () => {
     cy.findByTestId('DialogHeader-TestBot_TestSample').within(() => {
       cy.findByTestId('dialogMoreButton').click({ force: true });
     });
-    cy.findAllByText('Add a trigger').click({ force: true });
+    cy.findAllByText('Add new trigger').click({ force: true });
     cy.findByTestId('triggerTypeDropDown').click();
     cy.get('[title="Intent recognized"]').click();
     cy.findByTestId('TriggerName').type('myTrigger1');
@@ -92,7 +92,7 @@ context('breadcrumb', () => {
     cy.findByTestId('DialogHeader-TestBot_TestSample').within(() => {
       cy.findByTestId('dialogMoreButton').click({ force: true });
     });
-    cy.findAllByText('Add a trigger').click({ force: true });
+    cy.findAllByText('Add new trigger').click({ force: true });
     cy.findByTestId('triggerTypeDropDown').click();
     cy.get('[title="Dialog events"]').click();
     cy.findByText('Select an event type').click();
@@ -104,7 +104,7 @@ context('breadcrumb', () => {
     cy.findByTestId('DialogHeader-TestBot_TestSample').within(() => {
       cy.findByTestId('dialogMoreButton').click({ force: true });
     });
-    cy.findAllByText('Add a trigger').click({ force: true });
+    cy.findAllByText('Add new trigger').click({ force: true });
     cy.findByTestId('triggerTypeDropDown').click();
     cy.get('[title="Custom events"]').click();
     cy.findByTestId('CustomEventName').type('myCustomEvent');
@@ -115,7 +115,7 @@ context('breadcrumb', () => {
     cy.findByTestId('DialogHeader-TestBot_TestSample').within(() => {
       cy.findByTestId('dialogMoreButton').click({ force: true });
     });
-    cy.findAllByText('Add a trigger').click({ force: true });
+    cy.findAllByText('Add new trigger').click({ force: true });
     cy.findByTestId('triggerTypeDropDown').click();
     cy.get('[title="Activities"]').click();
     cy.findByText('Select an activity type').click();

From f7cd692f82131b39c1453a051fa33341af9da981 Mon Sep 17 00:00:00 2001
From: Ben Brown <benbro@microsoft.com>
Date: Tue, 4 May 2021 17:18:38 -0500
Subject: [PATCH 10/11] fix linter problem

---
 .../client/src/components/ManageService/ManageService.tsx        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Composer/packages/client/src/components/ManageService/ManageService.tsx b/Composer/packages/client/src/components/ManageService/ManageService.tsx
index 079bc063d6..c0a762a74c 100644
--- a/Composer/packages/client/src/components/ManageService/ManageService.tsx
+++ b/Composer/packages/client/src/components/ManageService/ManageService.tsx
@@ -23,7 +23,6 @@ import { ProvisionHandoff } from '@bfc/ui-shared';
 import sortBy from 'lodash/sortBy';
 import { NeutralColors } from '@uifabric/fluent-theme';
 import { AzureTenant } from '@botframework-composer/types';
-import { escapeRegExp } from 'lodash';
 
 import TelemetryClient from '../../telemetry/TelemetryClient';
 import { AuthClient } from '../../utils/authClient';

From a273756766069b0c52c64cb309c2d381515b314a Mon Sep 17 00:00:00 2001
From: Ben Brown <benbro@microsoft.com>
Date: Tue, 4 May 2021 17:40:26 -0500
Subject: [PATCH 11/11] fix typescript

---
 .../packages/client/src/pages/botProject/BotProjectInfo.tsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Composer/packages/client/src/pages/botProject/BotProjectInfo.tsx b/Composer/packages/client/src/pages/botProject/BotProjectInfo.tsx
index 5af5af4aff..b349b0c9b3 100644
--- a/Composer/packages/client/src/pages/botProject/BotProjectInfo.tsx
+++ b/Composer/packages/client/src/pages/botProject/BotProjectInfo.tsx
@@ -4,7 +4,7 @@
 /** @jsx jsx */
 import { css, jsx } from '@emotion/core';
 import { useRecoilValue } from 'recoil';
-import React, { useState, Fragment } from 'react';
+import React, { useState } from 'react';
 import { RouteComponentProps } from '@reach/router';
 import { DisplayMarkdownDialog } from '@bfc/ui-shared';
 import formatMessage from 'format-message';