Merge branch 'aqualls-fix-once-message' into 'master'

Revise merge-blocked message to use 'after' not 'once'

See merge request gitlab-org/gitlab!78493

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

@@ -6,7 +6,7 @@ export default {
   i18n: {
     approvalNeeded: s__('mrWidget|Merge blocked: this merge request must be approved.'),
     blockingMergeRequests: s__(
-      'mrWidget|Merge blocked: you can only merge once above items are resolved.',
+      'mrWidget|Merge blocked: you can only merge after the above items are resolved.',
     ),
   },
   components: {

locale/gitlab.pot

@@ -42711,7 +42711,7 @@ msgstr ""
 msgid "mrWidget|Merge blocked: this merge request must be approved."
 msgstr ""
 
-msgid "mrWidget|Merge blocked: you can only merge once above items are resolved."
+msgid "mrWidget|Merge blocked: you can only merge after the above items are resolved."
 msgstr ""
 
 msgid "mrWidget|Merge failed."