Add latest changes from gitlab-org/gitlab@master

2 files changed, 10 insertions, 10 deletions

diff --git a/app/assets/javascripts/self_monitor/components/self_monitor_form.vue b/app/assets/javascripts/self_monitor/components/self_monitor_form.vue
index b14e816a674..ffba3aac681 100644
--- a/app/assets/javascripts/self_monitor/components/self_monitor_form.vue
+++ b/app/assets/javascripts/self_monitor/components/self_monitor_form.vue
@@ -29,7 +29,7 @@ export default {
     SafeHtml: GlSafeHtmlDirective,
   },
   formLabels: {
-    createProject: __('Self monitoring'),
+    createProject: __('Self-monitoring'),
   },
   data() {
     return {
@@ -60,7 +60,7 @@ export default {
       if (this.projectCreated) {
         return sprintf(
           s__(
-            'SelfMonitoring|Self monitoring is active. Use the %{projectLinkStart}self monitoring project%{projectLinkEnd} to monitor the health of your instance.',
+            'SelfMonitoring|Self-monitoring is active. Use the %{projectLinkStart}self-monitoring project%{projectLinkEnd} to monitor the health of your instance.',
           ),
           {
             projectLinkStart: `<a href="${this.selfMonitorProjectFullUrl}">`,
@@ -71,7 +71,7 @@ export default {
       }
 
       return s__(
-        'SelfMonitoring|Activate self monitoring to create a project to use to monitor the health of your instance.',
+        'SelfMonitoring|Activate self-monitoring to create a project to use to monitor the health of your instance.',
       );
     },
     helpDocsPath() {
@@ -139,11 +139,11 @@ export default {
       <h4
         class="js-section-header settings-title js-settings-toggle js-settings-toggle-trigger-only"
       >
-        {{ s__('SelfMonitoring|Self monitoring') }}
+        {{ s__('SelfMonitoring|Self-monitoring') }}
       </h4>
       <gl-button class="js-settings-toggle">{{ __('Expand') }}</gl-button>
       <p class="js-section-sub-header">
-        {{ s__('SelfMonitoring|Activate or deactivate instance self monitoring.') }}
+        {{ s__('SelfMonitoring|Activate or deactivate instance self-monitoring.') }}
         <gl-link :href="helpDocsPath">{{ __('Learn more.') }}</gl-link>
       </p>
     </div>
@@ -160,9 +160,9 @@ export default {
       </form>
     </div>
     <gl-modal
-      :title="s__('SelfMonitoring|Deactivate self monitoring?')"
+      :title="s__('SelfMonitoring|Deactivate self-monitoring?')"
       :modal-id="modalId"
-      :ok-title="__('Delete self monitoring project')"
+      :ok-title="__('Delete self-monitoring project')"
       :cancel-title="__('Cancel')"
       ok-variant="danger"
       category="primary"
@@ -172,7 +172,7 @@ export default {
       <div>
         {{
           s__(
-            'SelfMonitoring|Deactivating self monitoring deletes the self monitoring project. Are you sure you want to deactivate self monitoring and delete the project?',
+            'SelfMonitoring|Deactivating self-monitoring deletes the self-monitoring project. Are you sure you want to deactivate self-monitoring and delete the project?',
           )
         }}
       </div>
diff --git a/app/assets/javascripts/self_monitor/store/actions.js b/app/assets/javascripts/self_monitor/store/actions.js
index f37b654b00a..5b9e994290c 100644
--- a/app/assets/javascripts/self_monitor/store/actions.js
+++ b/app/assets/javascripts/self_monitor/store/actions.js
@@ -56,7 +56,7 @@ export const requestCreateProjectSuccess = ({ commit, dispatch }, selfMonitorDat
   commit(types.SET_LOADING, false);
   commit(types.SET_PROJECT_URL, selfMonitorData.project_full_path);
   commit(types.SET_ALERT_CONTENT, {
-    message: s__('SelfMonitoring|Self monitoring project successfully created.'),
+    message: s__('SelfMonitoring|Self-monitoring project successfully created.'),
     actionText: __('View project'),
     actionName: 'viewSelfMonitorProject',
   });
@@ -108,7 +108,7 @@ export const requestDeleteProjectSuccess = ({ commit }) => {
   commit(types.SET_PROJECT_URL, '');
   commit(types.SET_PROJECT_CREATED, false);
   commit(types.SET_ALERT_CONTENT, {
-    message: s__('SelfMonitoring|Self monitoring project successfully deleted.'),
+    message: s__('SelfMonitoring|Self-monitoring project successfully deleted.'),
     actionText: __('Undo'),
     actionName: 'createProject',
   });