Merge branch 'update_create_with_a_merge_request_text' into 'master'

Update scan policy text related to merge request

See merge request gitlab-org/gitlab!81893

ee/app/assets/javascripts/threat_monitoring/components/policy_editor/policy_editor_layout.vue

@@ -166,7 +166,7 @@ export default {
     >
       <gl-button
         type="submit"
-        variant="success"
+        variant="confirm"
         data-testid="save-policy"
         :loading="isUpdatingPolicy"
         :disabled="disableUpdate"

ee/app/assets/javascripts/threat_monitoring/components/policy_editor/scan_execution_policy/scan_execution_policy_editor.vue

@@ -17,7 +17,7 @@ export default {
   DEFAULT_EDITOR_MODE: EDITOR_MODE_YAML,
   EDITOR_MODES: [EDITOR_MODES[1]],
   i18n: {
-    createMergeRequest: __('Create via merge request'),
+    createMergeRequest: __('Configure with a merge request'),
     notOwnerButtonText: __('Learn more'),
     notOwnerDescription: s__(
       'SecurityOrchestration|Scan execution policies can only be created by project owners.',

ee/app/assets/javascripts/threat_monitoring/components/policy_editor/scan_result_policy/scan_result_policy_editor.vue

@@ -37,7 +37,7 @@ export default {
     name: __('Name'),
     toggleLabel: s__('SecurityOrchestration|Policy status'),
     rules: s__('SecurityOrchestration|Rules'),
-    createMergeRequest: __('Create via merge request'),
+    createMergeRequest: __('Configure with a merge request'),
     notOwnerButtonText: __('Learn more'),
     notOwnerDescription: s__(
       'SecurityOrchestration|Scan result policies can only be created by project owners.',

locale/gitlab.pot

@@ -9269,6 +9269,9 @@ msgstr ""
 msgid "Configure which lists are shown for anyone who visits this board"
 msgstr ""
 
+msgid "Configure with a merge request"
+msgstr ""
+
 msgid "Configure your environments to be deployed to specific geographical regions"
 msgstr ""
 
@@ -10352,9 +10355,6 @@ msgstr ""
 msgid "Create user"
 msgstr ""
 
-msgid "Create via merge request"
-msgstr ""
-
 msgid "Create wildcard: %{searchTerm}"
 msgstr ""