[CCR] Copy edits

src/ui/public/indices/constants/index.js

@@ -19,4 +19,9 @@
 
 import { INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE } from 'ui/index_patterns';
 
-export const INDEX_ILLEGAL_CHARACTERS_VISIBLE = INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE.concat(',');
+export const INDEX_ILLEGAL_CHARACTERS_VISIBLE = [ ...INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE ];
+
+// Insert the comma into the middle, so it doesn't look as if it has grammatical meaning when
+// these characters are rendered in the UI.
+const insertionIndex = Math.floor(INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE.length / 2);
+INDEX_ILLEGAL_CHARACTERS_VISIBLE.splice(insertionIndex, 0, ',');

x-pack/plugins/cross_cluster_replication/public/app/app.js

@@ -182,14 +182,15 @@ export const App = injectI18n(
                 <h2>
                   <FormattedMessage
                     id="xpack.crossClusterReplication.app.deniedPermissionTitle"
-                    defaultMessage="Permission denied"
+                    defaultMessage="You're missing cluster privileges"
                   />
                 </h2>}
               body={
                 <p>
                   <FormattedMessage
                     id="xpack.crossClusterReplication.app.deniedPermissionDescription"
-                    defaultMessage="You do not have required cluster privileges ({clusterPrivileges}) for Cross Cluster Replication."
+                    defaultMessage="To use Cross Cluster Replication, you must have {clusterPrivileges,
+                      plural, one {this cluster privilege} other {these cluster privileges}}: {clusterPrivileges}."
                     values={{ clusterPrivileges: missingClusterPrivileges.join(', ') }}
                   />
                 </p>}

x-pack/plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_form.js

@@ -301,13 +301,13 @@ export class AutoFollowPatternFormUI extends PureComponent {
         />),
         remoteClusterNotConnectedNotEditable: () => (<FormattedMessage
           id="xpack.crossClusterReplication.autoFollowPatternForm.currentRemoteClusterNotConnectedCallOutDescription"
-          defaultMessage="You need to connect it before editing this auto-follow pattern. Edit the remote cluster to
-            fix the problem."
+          defaultMessage="The remote cluster must be connected to edit this auto-follow pattern."
         />),
-        remoteClusterDoesNotExist: () => (<FormattedMessage
+        remoteClusterDoesNotExist: (name) => (<FormattedMessage
           id="xpack.crossClusterReplication.autoFollowPatternForm.currentRemoteClusterNotFoundCallOutDescription"
-          defaultMessage="It might have been removed. In order to edit this auto-follow pattern,
-            you need to add a remote cluster with the same name."
+          defaultMessage="Before you can edit this auto-follow pattern, you must add a remote cluster
+            named '{name}'."
+          values={{ name }}
         />)
       };
 

x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_form/advanced_settings_fields.js

@@ -18,7 +18,7 @@ const byteUnitsHelpText = (
       <a href={byteUnitsUrl} target="_blank">
         <FormattedMessage
           id="xpack.crossClusterReplication.followerIndexForm.advancedSettings.byteUnitsHelpTextLinkMessage"
-          defaultMessage="Learn more."
+          defaultMessage="Learn more"
         />
       </a>
     ) }}
@@ -33,7 +33,7 @@ const timeUnitsHelpText = (
       <a href={timeUnitsUrl} target="_blank">
         <FormattedMessage
           id="xpack.crossClusterReplication.followerIndexForm.advancedSettings.timeUnitsHelpTextLinkMessage"
-          defaultMessage="Learn more."
+          defaultMessage="Learn more"
         />
       </a>
     ) }}

x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_form/follower_index_form.js

@@ -343,7 +343,7 @@ export const FollowerIndexForm = injectI18n(
 
       const indexNameLabel = i18n.translate(
         'xpack.crossClusterReplication.followerIndexForm.sectionFollowerIndexNameTitle', {
-          defaultMessage: 'Name'
+          defaultMessage: 'Follower index'
         }
       );
 
@@ -359,7 +359,7 @@ export const FollowerIndexForm = injectI18n(
           )}
           label={indexNameLabel}
           description={i18n.translate('xpack.crossClusterReplication.followerIndexForm.sectionFollowerIndexNameDescription', {
-            defaultMessage: 'A name for the follower index.'
+            defaultMessage: 'A unique name for your index.'
           })}
           helpText={indexNameHelpText}
           isLoading={isValidatingIndexName}
@@ -382,13 +382,13 @@ export const FollowerIndexForm = injectI18n(
           />),
           remoteClusterNotConnectedNotEditable: () => (<FormattedMessage
             id="xpack.crossClusterReplication.followerIndexForm.currentRemoteClusterNotConnectedCallOutDescription"
-            defaultMessage="You need to connect it before editing this follower index. Edit the remote cluster to
-              fix the problem."
+            defaultMessage="The remote cluster must be connected to edit this follower index."
           />),
-          remoteClusterDoesNotExist: () => (<FormattedMessage
+          remoteClusterDoesNotExist: (name) => (<FormattedMessage
             id="xpack.crossClusterReplication.followerIndexForm.currentRemoteClusterNotFoundCallOutDescription"
-            defaultMessage="It might have been removed. In order to edit this follower index,
-              you need to add a remote cluster with the same name."
+            defaultMessage="Before you can edit this follower index, you must add a remote cluster
+              named '{name}'."
+            values={{ name }}
           />)
         };
 
@@ -407,7 +407,7 @@ export const FollowerIndexForm = injectI18n(
             description={(
               <FormattedMessage
                 id="xpack.crossClusterReplication.followerIndexForm.sectionRemoteClusterDescription"
-                defaultMessage="The remote cluster to replicate your leader index from."
+                defaultMessage="The cluster that contains the index to replicate."
               />
             )}
             fullWidth
@@ -449,9 +449,31 @@ export const FollowerIndexForm = injectI18n(
             </EuiTitle>
           )}
           label={leaderIndexLabel}
-          description={i18n.translate('xpack.crossClusterReplication.followerIndexForm.sectionLeaderIndexDescription', {
-            defaultMessage: 'The leader index you want to replicate from the remote cluster.'
-          })}
+          description={(
+            <Fragment>
+              <p>
+                <FormattedMessage
+                  id="xpack.crossClusterReplication.followerIndexForm.sectionLeaderIndexDescription"
+                  defaultMessage="The index you want to replicate."
+                />
+              </p>
+
+              <p>
+                <FormattedMessage
+                  id="xpack.crossClusterReplication.followerIndexForm.sectionLeaderIndexDescription2"
+                  defaultMessage="{note} the leader index must already exist."
+                  values={{ note: (
+                    <strong>
+                      <FormattedMessage
+                        id="xpack.crossClusterReplication.followerIndexForm.sectionLeaderIndexDescription2.noteLabel"
+                        defaultMessage="Note:"
+                      />
+                    </strong>
+                  ) }}
+                />
+              </p>
+            </Fragment>
+          )}
           helpText={(
             <FormattedMessage
               id="xpack.crossClusterReplication.followerIndexForm.indexNameHelpLabel"
@@ -489,8 +511,7 @@ export const FollowerIndexForm = injectI18n(
                   <p>
                     <FormattedMessage
                       id="xpack.crossClusterReplication.followerIndexForm.advancedSettingsDescription"
-                      defaultMessage="Customize advanced settings to control the rate at which data is replicated.
-                        If you don't customize them, default advanced settings will be applied."
+                      defaultMessage="Advanced settings control the rate at which data is replicated.."
                     />
                   </p>
 

x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_pause_provider.js

@@ -56,11 +56,11 @@ class Provider extends PureComponent {
     const title = isSingle
       ? intl.formatMessage({
         id: 'xpack.crossClusterReplication.pauseFollowerIndex.confirmModal.pauseSingleTitle',
-        defaultMessage: 'Pause follower index \'{name}\'?',
+        defaultMessage: 'Pause data replication of follower index \'{name}\'?',
       }, { name: indices[0].name })
       : intl.formatMessage({
         id: 'xpack.crossClusterReplication.pauseFollowerIndex.confirmModal.pauseMultipleTitle',
-        defaultMessage: 'Pause {count} follower indices?',
+        defaultMessage: 'Pause data replication of {count} follower indices?',
       }, { count: indices.length });
     const hasCustomSettings = indices.some(index => !areAllSettingsDefault(index));
 
@@ -78,50 +78,42 @@ class Provider extends PureComponent {
             })
           }
           buttonColor={hasCustomSettings ? 'danger' : 'primary'}
-          confirmButtonText={
-            hasCustomSettings ? intl.formatMessage({
-              id: 'xpack.crossClusterReplication.pauseFollowerIndex.confirmModal.confirmButtonTextWithSettingWarning',
-              defaultMessage: 'Pause and revert advanced settings to defaults',
-            }) : intl.formatMessage({
-              id: 'xpack.crossClusterReplication.pauseFollowerIndex.confirmModal.confirmButtonText',
-              defaultMessage: 'Pause',
-            })
-          }
+          confirmButtonText={intl.formatMessage({
+            id: 'xpack.crossClusterReplication.pauseFollowerIndex.confirmModal.confirmButtonText',
+            defaultMessage: 'Pause data replication',
+          })}
           onMouseOver={this.onMouseOverModal}
         >
-          {isSingle ? (
-            <Fragment>
-              {
-                hasCustomSettings ? (
-                  <p>
-                    <FormattedMessage
-                      id="xpack.crossClusterReplication.pauseFollowerIndex.confirmModal.singlePauseDescriptionWithSettingWarning"
-                      defaultMessage="The custom advanced settings on this follower index will be reverted to default
-                        advanced settings."
-                    />
-                  </p>
-                ) : null
-              }
-            </Fragment>
-          ) : (
+          {hasCustomSettings && (
+            <p>
+              {isSingle ? (
+                <FormattedMessage
+                  id="xpack.crossClusterReplication.pauseFollowerIndex.confirmModal.singlePauseDescriptionWithSettingWarning"
+                  defaultMessage="Pausing data replication of this follower index clears its custom
+                    advanced settings."
+                />
+              ) : (
+                <FormattedMessage
+                  id="xpack.crossClusterReplication.pauseFollowerIndex.confirmModal.multiplePauseDescriptionWithSettingWarning"
+                  defaultMessage="Pausing data replication of a follower index clears its custom
+                    advanced settings."
+                />
+              )}
+            </p>
+          )}
+
+          {!isSingle && (
             <Fragment>
               <p>
-                {
-                  hasCustomSettings ? (
-                    <FormattedMessage
-                      id="xpack.crossClusterReplication.pauseFollowerIndex.confirmModal.multiplePauseDescriptionWithSettingWarning"
-                      defaultMessage="The follower indices below will be paused. Custom advanced settings on one or more
-                        of these follower indices will be reverted to default advanced settings."
-                    />
-                  ) : (
-                    <FormattedMessage
-                      id="xpack.crossClusterReplication.pauseFollowerIndex.confirmModal.multiplePauseDescription"
-                      defaultMessage="These follower indices will be paused:"
-                    />
-                  )
-                }
+                <FormattedMessage
+                  id="xpack.crossClusterReplication.pauseFollowerIndex.confirmModal.multiplePauseDescription"
+                  defaultMessage="These follower indices will pause data replication:"
+                />
               </p>
-              <ul>{indices.map(index => <li key={index.name}>{index.name}</li>)}</ul>
+
+              <ul>
+                {indices.map(index => <li key={index.name}>{index.name}</li>)}
+              </ul>
             </Fragment>
           )}
         </EuiConfirmModal>

x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_resume_provider.js

@@ -57,11 +57,11 @@ class Provider extends PureComponent {
     const title = isSingle
       ? intl.formatMessage({
         id: 'xpack.crossClusterReplication.resumeFollowerIndex.confirmModal.resumeSingleTitle',
-        defaultMessage: 'Resume follower index \'{name}\'?',
+        defaultMessage: 'Resume data replication of follower index \'{name}\'?',
       }, { name: ids[0] })
       : intl.formatMessage({
         id: 'xpack.crossClusterReplication.resumeFollowerIndex.confirmModal.resumeMultipleTitle',
-        defaultMessage: 'Resume {count} follower indices?',
+        defaultMessage: 'Resume data replication of {count} follower indices?',
       }, { count: ids.length });
 
     return (
@@ -81,7 +81,7 @@ class Provider extends PureComponent {
           confirmButtonText={
             intl.formatMessage({
               id: 'xpack.crossClusterReplication.resumeFollowerIndex.confirmModal.confirmButtonText',
-              defaultMessage: 'Resume using default advanced settings',
+              defaultMessage: 'Resume data replication',
             })
           }
           onMouseOver={this.onMouseOverModal}
@@ -90,14 +90,14 @@ class Provider extends PureComponent {
             <p>
               <FormattedMessage
                 id="xpack.crossClusterReplication.resumeFollowerIndex.confirmModal.singleResumeDescription"
-                defaultMessage="This follower index will be resumed using default advanced settings.
-                  To resume using custom advanced settings, {editLink}."
+                defaultMessage="Data replication resumes using the default advanced settings. To use
+                  custom advanced settings, {editLink}."
                 values={{
                   editLink: (
                     <EuiLink href={routing.getFollowerIndexPath(ids[0])}>
                       <FormattedMessage
                         id="xpack.crossClusterReplication.resumeFollowerIndex.confirmModal.singleResumeEditLink"
-                        defaultMessage="edit this follower index instead"
+                        defaultMessage="edit the follower index"
                       />
                     </EuiLink>
                   ),
@@ -106,14 +106,23 @@ class Provider extends PureComponent {
             </p>
           ) : (
             <Fragment>
+              <p>
+                <FormattedMessage
+                  id="xpack.crossClusterReplication.resumeFollowerIndex.confirmModal.multipleResumeDescriptionWithSettingWarning"
+                  defaultMessage="Data replication resumes using the default advanced settings."
+                />
+              </p>
+
               <p>
                 <FormattedMessage
                   id="xpack.crossClusterReplication.resumeFollowerIndex.confirmModal.multipleResumeDescription"
-                  defaultMessage="The follower indices below will be resumed using default advanced settings.
-                    To resume using custom advanced settings, edit each follower index instead."
+                  defaultMessage="These follower indices will resume data replication:"
                 />
               </p>
-              <ul>{ids.map(id => <li key={id}>{id}</li>)}</ul>
+
+              <ul>
+                {ids.map(id => <li key={id}>{id}</li>)}
+              </ul>
             </Fragment>
           )}
         </EuiConfirmModal>