Merge branch 'aqualls-approve-mr-first' into 'master'

UI text: the MR must be approved first

See merge request gitlab-org/gitlab!75058

app/assets/javascripts/vue_merge_request_widget/components/states/merge_checks_failed.vue

@@ -9,7 +9,7 @@ export default {
     pipelineFailed: s__(
       'mrWidget|The pipeline for this merge request did not complete. Push a new commit to fix the failure.',
     ),
-    approvalNeeded: s__('mrWidget|You can only merge once this merge request is approved.'),
+    approvalNeeded: s__('mrWidget|Merge blocked: this merge request must be approved.'),
     unresolvedDiscussions: s__('mrWidget|Merge blocked: all threads must be resolved.'),
   },
   components: {

ee/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js

 import { isNumber, isString } from 'lodash';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
-import { __ } from '~/locale';
+import { __, s__ } from '~/locale';
 import {
   MTWPS_MERGE_STRATEGY,
   MT_MERGE_STRATEGY,
@@ -8,8 +8,8 @@ import {
 } from '~/vue_merge_request_widget/constants';
 import base from '~/vue_merge_request_widget/mixins/ready_to_merge';
 
-export const MERGE_DISABLED_TEXT_UNAPPROVED = __(
-  'You can only merge once this merge request is approved.',
+export const MERGE_DISABLED_TEXT_UNAPPROVED = s__(
+  'mrWidget|Merge blocked: this merge request must be approved.',
 );
 export const PIPELINE_MUST_SUCCEED_CONFLICT_TEXT = __(
   'A CI/CD pipeline must run and be successful before merge.',

locale/gitlab.pot

@@ -39736,9 +39736,6 @@ msgstr ""
 msgid "You can only edit files when you are on a branch"
 msgstr ""
 
-msgid "You can only merge once this merge request is approved."
-msgstr ""
-
 msgid "You can only transfer the project to namespaces you manage."
 msgstr ""
 
@@ -41629,6 +41626,9 @@ msgstr ""
 msgid "mrWidget|Merge blocked: pipeline must succeed. It's waiting for a manual action to continue."
 msgstr ""
 
+msgid "mrWidget|Merge blocked: this merge request must be approved."
+msgstr ""
+
 msgid "mrWidget|Merge failed."
 msgstr ""
 
@@ -41773,9 +41773,6 @@ msgstr ""
 msgid "mrWidget|What is a merge train?"
 msgstr ""
 
-msgid "mrWidget|You can only merge once this merge request is approved."
-msgstr ""
-
 msgid "mrWidget|Your password"
 msgstr ""