Merge branch 'jlenny-master-patch-21737' into 'master'

Improve clarity of text for merge train position

See merge request gitlab-org/gitlab!19031

changelogs/unreleased/jlenny-master-patch-21737.yml

+---
+title: Improve clarity of text for merge train position
+merge_request: 19031
+author:
+type: changed

ee/app/assets/javascripts/vue_merge_request_widget/components/merge_train_position_indicator.vue

@@ -11,7 +11,7 @@ export default {
   },
   computed: {
     message() {
-      return sprintf(s__('mrWidget|Added to the merge train at position %{mergeTrainPosition}'), {
+      return sprintf(s__('mrWidget|In the merge train at position %{mergeTrainPosition}'), {
         mergeTrainPosition: this.mergeTrainIndex + 1,
       });
     },

ee/spec/frontend/vue_mr_widget/components/merge_train_position_indicator_spec.js

@@ -26,7 +26,7 @@ describe('MergeTrainPositionIndicator', () => {
       it('should return the message with the correct position (i.e., index + 1)', () => {
         factory({ mergeTrainIndex: 3 });
 
-        expect(vm.message).toBe('Added to the merge train at position 4');
+        expect(vm.message).toBe('In the merge train at position 4');
       });
     });
 
@@ -34,7 +34,7 @@ describe('MergeTrainPositionIndicator', () => {
       it('should render the correct message', () => {
         factory({ mergeTrainIndex: 3 });
 
-        expect(trimText(wrapper.text())).toBe('Added to the merge train at position 4');
+        expect(trimText(wrapper.text())).toBe('In the merge train at position 4');
       });
     });
   });

locale/gitlab.pot

@@ -20040,9 +20040,6 @@ msgstr ""
 msgid "mrWidget|%{metricsLinkStart} Memory %{metricsLinkEnd} usage is %{emphasisStart} unchanged %{emphasisEnd} at %{memoryFrom}MB"
 msgstr ""
 
-msgid "mrWidget|Added to the merge train at position %{mergeTrainPosition}"
-msgstr ""
-
 msgid "mrWidget|Added to the merge train by"
 msgstr ""
 
@@ -20124,6 +20121,9 @@ msgstr ""
 msgid "mrWidget|If the %{missingBranchName} branch exists in your local repository, you can merge this merge request manually using the command line"
 msgstr ""
 
+msgid "mrWidget|In the merge train at position %{mergeTrainPosition}"
+msgstr ""
+
 msgid "mrWidget|Loading deployment statistics"
 msgstr ""