elastic · alisonelizabeth · Jun 19, 2019 · Jun 18, 2019
diff --git a/x-pack/plugins/watcher/public/components/delete_watches_modal.tsx b/x-pack/plugins/watcher/public/components/delete_watches_modal.tsx
@@ -24,7 +24,7 @@ export const DeleteWatchesModal = ({
     'xpack.watcher.deleteSelectedWatchesConfirmModal.descriptionText',
     {
       defaultMessage:
-        'This will permanently delete {numWatchesToDelete, plural, one {a watch} other {# watches}}. You can’t recover a deleted watch.',
+        "You can't recover {numWatchesToDelete, plural, one {a deleted watch} other {deleted watches}}.",
       values: { numWatchesToDelete },
     }
   );

diff --git a/x-pack/plugins/watcher/public/models/action/email_action.js b/x-pack/plugins/watcher/public/models/action/email_action.js
@@ -101,9 +101,9 @@ export class EmailAction extends BaseAction {
   });
   static iconClass = 'email';
   static selectMessage = i18n.translate('xpack.watcher.models.emailAction.selectMessageText', {
-    defaultMessage: 'Send out an email from your server.',
+    defaultMessage: 'Send an email from your server.',
   });
   static simulatePrompt = i18n.translate('xpack.watcher.models.emailAction.simulateButtonLabel', {
-    defaultMessage: 'Test fire an email now'
+    defaultMessage: 'Send test email'
   });
 }
diff --git a/x-pack/plugins/watcher/public/models/action/index_action.js b/x-pack/plugins/watcher/public/models/action/index_action.js
@@ -76,6 +76,6 @@ export class IndexAction extends BaseAction {
     defaultMessage: 'Index data into Elasticsearch.',
   });
   static simulatePrompt = i18n.translate('xpack.watcher.models.indexAction.simulateButtonLabel', {
-    defaultMessage: 'Index data now',
+    defaultMessage: 'Index data',
   });
 }
diff --git a/x-pack/plugins/watcher/public/models/action/jira_action.js b/x-pack/plugins/watcher/public/models/action/jira_action.js
@@ -98,9 +98,9 @@ export class JiraAction extends BaseAction {
   });
   static iconClass = 'apps';
   static selectMessage = i18n.translate('xpack.watcher.models.jiraAction.selectMessageText', {
-    defaultMessage: 'Create issues in Atlassian’s Jira Software.',
+    defaultMessage: 'Create an issue in Atlassian’s Jira Software.',
   });
   static simulatePrompt = i18n.translate('xpack.watcher.models.jiraAction.simulateButtonLabel', {
-    defaultMessage: 'Create a sample Jira issue now'
+    defaultMessage: 'Create a sample Jira issue'
   });
 }
diff --git a/x-pack/plugins/watcher/public/models/action/logging_action.js b/x-pack/plugins/watcher/public/models/action/logging_action.js
@@ -70,9 +70,9 @@ export class LoggingAction extends BaseAction {
   });
   static iconClass = 'loggingApp';
   static selectMessage = i18n.translate('xpack.watcher.models.loggingAction.selectMessageText', {
-    defaultMessage: 'Add a new item to the logs.',
+    defaultMessage: 'Add an item to the logs.',
   });
   static simulatePrompt = i18n.translate('xpack.watcher.models.loggingAction.simulateButtonLabel', {
-    defaultMessage: 'Log a sample message now',
+    defaultMessage: 'Log a sample message',
   });
 }
diff --git a/x-pack/plugins/watcher/public/models/action/pagerduty_action.js b/x-pack/plugins/watcher/public/models/action/pagerduty_action.js
@@ -71,10 +71,10 @@ export class PagerDutyAction extends BaseAction {
   });
   static iconClass = 'apps';
   static selectMessage = i18n.translate('xpack.watcher.models.pagerDutyAction.selectMessageText', {
-    defaultMessage: 'Create events in PagerDuty.',
+    defaultMessage: 'Create an event in PagerDuty.',
   });
   static simulatePrompt = i18n.translate('xpack.watcher.models.pagerDutyAction.simulateButtonLabel', {
-    defaultMessage: 'Test fire a PagerDuty event'
+    defaultMessage: 'Send a PagerDuty event'
   });
 }
 
diff --git a/x-pack/plugins/watcher/public/models/action/slack_action.js b/x-pack/plugins/watcher/public/models/action/slack_action.js
@@ -85,6 +85,6 @@ export class SlackAction extends BaseAction {
     defaultMessage: 'Send a message to a Slack user or channel.'
   });
   static simulatePrompt = i18n.translate('xpack.watcher.models.slackAction.simulateButtonLabel', {
-    defaultMessage: 'Send a sample message now'
+    defaultMessage: 'Send a sample message'
   });
 }
diff --git a/x-pack/plugins/watcher/public/models/action/webhook_action.js b/x-pack/plugins/watcher/public/models/action/webhook_action.js
@@ -135,9 +135,9 @@ export class WebhookAction extends BaseAction {
   });
   static iconClass = 'logoWebhook';
   static selectMessage = i18n.translate('xpack.watcher.models.webhookAction.selectMessageText', {
-    defaultMessage: 'Send a request to any web service.',
+    defaultMessage: 'Send a request to a web service.',
   });
   static simulatePrompt = i18n.translate('xpack.watcher.models.webhookAction.simulateButtonLabel', {
-    defaultMessage: 'Send request now',
+    defaultMessage: 'Send request',
   });
 }
diff --git a/x-pack/plugins/watcher/public/models/watch/threshold_watch.js b/x-pack/plugins/watcher/public/models/watch/threshold_watch.js
@@ -75,7 +75,7 @@ export class ThresholdWatch extends BaseWatch {
     const staticPart = i18n.translate(
       'xpack.watcher.models.thresholdWatch.sendAlertOnSpecificConditionTitleDescription',
       {
-        defaultMessage: 'Send an alert when a specific condition is met.',
+        defaultMessage: 'Send an alert when your specified condition is met.',
       }
     );
     if (isNaN(this.triggerIntervalSize)) {
@@ -86,7 +86,7 @@ export class ThresholdWatch extends BaseWatch {
     const dynamicPartText = i18n.translate(
       'xpack.watcher.models.thresholdWatch.thresholdWatchIntervalTitleDescription',
       {
-        defaultMessage: 'This will run every {triggerIntervalSize} {timeUnitLabel}.',
+        defaultMessage: 'Your watch will run every {triggerIntervalSize} {timeUnitLabel}.',
         values: {
           triggerIntervalSize: this.triggerIntervalSize,
           timeUnitLabel,
@@ -111,7 +111,7 @@ export class ThresholdWatch extends BaseWatch {
     if (!this.name) {
       errors.name.push(
         i18n.translate('xpack.watcher.sections.watchEdit.threshold.error.requiredNameText', {
-          defaultMessage: 'Name is required',
+          defaultMessage: 'Name is required.',
         })
       );
     }
@@ -120,7 +120,7 @@ export class ThresholdWatch extends BaseWatch {
         i18n.translate(
           'xpack.watcher.sections.watchEdit.threshold.enterOneOrMoreIndicesValidationMessage',
           {
-            defaultMessage: 'Enter one or more indices',
+            defaultMessage: 'Enter one or more indices.',
           }
         )
       );
@@ -134,7 +134,7 @@ export class ThresholdWatch extends BaseWatch {
         i18n.translate(
           'xpack.watcher.sections.watchEdit.threshold.invalidIndexValidationMessage',
           {
-            defaultMessage: 'Your index query does not have an associated time field',
+            defaultMessage: 'Index does not have a time field.',
           }
         )
       );
@@ -174,7 +174,7 @@ export class ThresholdWatch extends BaseWatch {
         i18n.translate(
           'xpack.watcher.watchEdit.thresholdWatchExpression.aggType.fieldIsRequiredValidationMessage',
           {
-            defaultMessage: 'Please select a field',
+            defaultMessage: 'This field is required.',
           }
         )
       );
@@ -196,7 +196,7 @@ export class ThresholdWatch extends BaseWatch {
           i18n.translate(
             'xpack.watcher.thresholdWatchExpression.groupBy.requiredFieldValidationMessage',
             {
-              defaultMessage: 'Please select a field.',
+              defaultMessage: 'This field is required.',
             }
           )
         );
@@ -219,7 +219,7 @@ export class ThresholdWatch extends BaseWatch {
       errors.threshold1.push(i18n.translate(
         'xpack.watcher.thresholdWatchExpression.thresholdLevel.secondValueMustBeGreaterMessage',
         {
-          defaultMessage: 'This value must be greater than {lowerBound}.',
+          defaultMessage: 'Value must be greater than {lowerBound}.',
           values: {
             lowerBound: this.threshold[0]
           }

diff --git a/...ns/watcher/public/sections/watch_edit/components/json_watch_edit/json_watch_edit_form.tsx b/...ns/watcher/public/sections/watch_edit/components/json_watch_edit/json_watch_edit_form.tsx
@@ -130,7 +130,7 @@ export const JsonWatchEditForm = () => {
               (
               <EuiLink href={putWatchApiUrl} target="_blank">
                 {i18n.translate('xpack.watcher.sections.watchEdit.json.form.watchJsonDocLink', {
-                  defaultMessage: 'Syntax',
+                  defaultMessage: 'API syntax',
                 })}
               </EuiLink>
               )
@@ -189,12 +189,12 @@ export const JsonWatchEditForm = () => {
               {watch.isNew ? (
                 <FormattedMessage
                   id="xpack.watcher.sections.watchEdit.json.createButtonLabel"
-                  defaultMessage="Create"
+                  defaultMessage="Create watch"
                 />
               ) : (
                 <FormattedMessage
                   id="xpack.watcher.sections.watchEdit.json.saveButtonLabel"
-                  defaultMessage="Save"
+                  defaultMessage="Save watch"
                 />
               )}
             </EuiButton>

diff --git a/...atcher/public/sections/watch_edit/components/json_watch_edit/json_watch_edit_simulate.tsx b/...atcher/public/sections/watch_edit/components/json_watch_edit/json_watch_edit_simulate.tsx
@@ -153,7 +153,7 @@ export const JsonWatchEditSimulate = ({
         <p>
           {i18n.translate('xpack.watcher.sections.watchEdit.simulate.pageDescription', {
             defaultMessage:
-              'Use the simulator to override the watch schedule, input results, conditions, and actions.',
+              'Use the simulator to override the watch schedule, condition, actions, and input results.',
           })}
         </p>
       </EuiText>
@@ -172,7 +172,7 @@ export const JsonWatchEditSimulate = ({
           description={i18n.translate(
             'xpack.watcher.sections.watchEdit.simulate.form.triggerOverridesDescription',
             {
-              defaultMessage: 'Schedule the time and date for starting the watch.',
+              defaultMessage: 'Set the time and date for starting the watch.',
             }
           )}
         >

diff --git a/.../sections/watch_edit/components/threshold_watch_edit/threshold_watch_action_accordion.tsx b/.../sections/watch_edit/components/threshold_watch_edit/threshold_watch_action_accordion.tsx
@@ -161,7 +161,7 @@ export const WatchActionsAccordion: React.FunctionComponent<Props> = ({
                     title={i18n.translate(
                       'xpack.watcher.sections.watchEdit.threshold.actions.actionConfigurationWarningTitleText',
                       {
-                        defaultMessage: 'Account may not be configured.',
+                        defaultMessage: 'Account may not be configured',
                       }
                     )}
                     color="warning"
@@ -171,7 +171,7 @@ export const WatchActionsAccordion: React.FunctionComponent<Props> = ({
                       <p>
                         <FormattedMessage
                           id="xpack.watcher.sections.watchEdit.threshold.actions.actionConfigurationWarningDescriptionText"
-                          defaultMessage="To create this action, at least one {accountType} account must be configured. {docLink}"
+                          defaultMessage="To create this action, you must configure at least one {accountType} account. {docLink}"
                           values={{
                             accountType: action.typeName,
                             docLink: (

diff --git a/...c/sections/watch_edit/components/threshold_watch_edit/threshold_watch_action_dropdown.tsx b/...c/sections/watch_edit/components/threshold_watch_edit/threshold_watch_action_dropdown.tsx
@@ -24,7 +24,7 @@ import { WatchContext } from '../../watch_context';
 const disabledMessage = i18n.translate(
   'xpack.watcher.sections.watchEdit.actions.disabledOptionLabel',
   {
-    defaultMessage: 'Disabled. Configure elasticsearch.yml.',
+    defaultMessage: 'Disabled. Configure your elasticsearch.yml.',
   }
 );
 

diff --git a/...blic/sections/watch_edit/components/threshold_watch_edit/threshold_watch_action_panel.tsx b/...blic/sections/watch_edit/components/threshold_watch_edit/threshold_watch_action_panel.tsx
@@ -32,7 +32,7 @@ export const WatchActionsPanel: React.FunctionComponent<Props> = ({ actionErrors
             <h3>
               {i18n.translate('xpack.watcher.sections.watchEdit.actions.title', {
                 defaultMessage:
-                  'Will perform {watchActionsCount, plural, one{# action} other {# actions}} once met',
+                  'Perform {watchActionsCount, plural, one{# action} other {# actions}} when condition is met',
                 values: {
                   watchActionsCount: watch.actions.length,
                 },

diff --git a/...tcher/public/sections/watch_edit/components/threshold_watch_edit/threshold_watch_edit.tsx b/...tcher/public/sections/watch_edit/components/threshold_watch_edit/threshold_watch_edit.tsx
@@ -179,7 +179,7 @@ const ThresholdWatchEditUi = ({ intl, pageTitle }: { intl: InjectedIntl; pageTit
   const expressionErrorMessage = i18n.translate(
     'xpack.watcher.thresholdWatchExpression.fixErrorInExpressionBelowValidationMessage',
     {
-      defaultMessage: 'Your expression has errors.',
+      defaultMessage: 'Expression contains errors.',
     }
   );
   const expressionFields = [
@@ -269,7 +269,7 @@ const ThresholdWatchEditUi = ({ intl, pageTitle }: { intl: InjectedIntl; pageTit
               helpText={
                 <FormattedMessage
                   id="xpack.watcher.sections.watchEdit.titlePanel.howToBroadenSearchQueryDescription"
-                  defaultMessage="Use * to broaden your search query"
+                  defaultMessage="Use * to broaden your query."
                 />
               }
             >
@@ -396,7 +396,7 @@ const ThresholdWatchEditUi = ({ intl, pageTitle }: { intl: InjectedIntl; pageTit
               <h3>
                 <FormattedMessage
                   id="xpack.watcher.sections.watchEdit.watchConditionSectionTitle"
-                  defaultMessage="Matching the following condition"
+                  defaultMessage="Match the following condition"
                 />
               </h3>
             </EuiTitle>
@@ -851,12 +851,12 @@ const ThresholdWatchEditUi = ({ intl, pageTitle }: { intl: InjectedIntl; pageTit
               {watch.isNew ? (
                 <FormattedMessage
                   id="xpack.watcher.sections.watchEdit.threshold.createButtonLabel"
-                  defaultMessage="Create"
+                  defaultMessage="Create alert"
                 />
               ) : (
                 <FormattedMessage
                   id="xpack.watcher.sections.watchEdit.threshold.saveButtonLabel"
-                  defaultMessage="Save"
+                  defaultMessage="Save alert"
                 />
               )}
             </EuiButton>

diff --git a/x-pack/plugins/watcher/public/sections/watch_list/components/watch_list.tsx b/x-pack/plugins/watcher/public/sections/watch_list/components/watch_list.tsx
@@ -68,14 +68,10 @@ const WatchListUi = () => {
   );
 
   const watcherDescriptionText = (
-    <EuiText color="subdued">
-      <p>
-        <FormattedMessage
-          id="xpack.watcher.sections.watchList.subhead"
-          defaultMessage="Use Watcher to watch for changes or anomalies in your data and perform the necessary actions in response."
-        />
-      </p>
-    </EuiText>
+    <FormattedMessage
+      id="xpack.watcher.sections.watchList.subhead"
+      defaultMessage="Watch for changes or anomalies in your data and take action if needed."
+    />
   );
 
   const createWatchContextMenu = (
@@ -129,7 +125,7 @@ const WatchListUi = () => {
                     <span>
                       <FormattedMessage
                         id="xpack.watcher.sections.watchList.createThresholdAlertButtonTooltip"
-                        defaultMessage="Send an alert on a specific condition"
+                        defaultMessage="Send an alert on a specified condition."
                       />
                     </span>
                   </EuiText>
@@ -148,7 +144,7 @@ const WatchListUi = () => {
                     <span>
                       <FormattedMessage
                         id="xpack.watcher.sections.watchList.createAdvancedWatchTooltip"
-                        defaultMessage="Set up a custom watch in raw JSON"
+                        defaultMessage="Set up a custom watch in JSON."
                       />
                     </span>
                   </EuiText>
@@ -171,16 +167,17 @@ const WatchListUi = () => {
 
   if (availableWatches && availableWatches.length === 0) {
     const emptyPromptBody = (
-      <Fragment>
-        {watcherDescriptionText}
-        {''}
-        <EuiLink href={watcherGettingStartedUrl} target="_blank">
-          <FormattedMessage
-            id="xpack.watcher.sections.watchList.watcherLearnMoreLinkText"
-            defaultMessage="Learn more."
-          />
-        </EuiLink>
-      </Fragment>
+      <EuiText color="subdued">
+        <p>
+          {watcherDescriptionText}{' '}
+          <EuiLink href={watcherGettingStartedUrl} target="_blank">
+            <FormattedMessage
+              id="xpack.watcher.sections.watchList.watcherLearnMoreLinkText"
+              defaultMessage="Learn more."
+            />
+          </EuiLink>
+        </p>
+      </EuiText>
     );
 
     return (
@@ -191,7 +188,7 @@ const WatchListUi = () => {
             <h1>
               <FormattedMessage
                 id="xpack.watcher.sections.watchList.emptyPromptTitle"
-                defaultMessage="You don't have any watches yet"
+                defaultMessage="You don’t have any watches yet"
               />
             </h1>
           }
@@ -446,7 +443,9 @@ const WatchListUi = () => {
 
       <EuiSpacer size="s" />
 
-      {watcherDescriptionText}
+      <EuiText color="subdued">
+        <p>{watcherDescriptionText}</p>
+      </EuiText>
 
       <EuiSpacer size="xl" />
 

diff --git a/x-pack/plugins/watcher/public/sections/watch_status/components/watch_detail.tsx b/x-pack/plugins/watcher/public/sections/watch_status/components/watch_detail.tsx
@@ -122,7 +122,7 @@ const WatchDetailUi = () => {
               content={i18n.translate(
                 'xpack.watcher.sections.watchDetail.watchTable.ackActionCellTooltipTitle',
                 {
-                  defaultMessage: 'Acknowledge this watch action',
+                  defaultMessage: 'Acknowledge watch action.',
                 }
               )}
             >
@@ -192,7 +192,7 @@ const WatchDetailUi = () => {
           <EuiFlyoutBody>
             <EuiCallOut
               title={i18n.translate('xpack.watcher.sections.watchDetail.actionErrorsCalloutTitle', {
-                defaultMessage: 'This action contains errors.',
+                defaultMessage: 'This action contains errors',
               })}
               color="danger"
               iconType="cross"

diff --git a/x-pack/plugins/watcher/public/sections/watch_status/components/watch_status.tsx b/x-pack/plugins/watcher/public/sections/watch_status/components/watch_status.tsx
@@ -189,7 +189,7 @@ export const WatchStatus = ({
                   content={
                     <FormattedMessage
                       id="xpack.watcher.sections.watchDetail.headerBadgeToolipText"
-                      defaultMessage="System watches cannot be deactivated or deleted."
+                      defaultMessage="You cannot deactivate or delete a system watch."
                     />
                   }
                 >