Merge branch '323906-aqualls-fix-comma-splice' into 'master'

Revise bad warning message: remove comma splice

See merge request gitlab-org/gitlab!56115

app/assets/javascripts/notes/components/note_form.vue

@@ -201,7 +201,7 @@ export default {
     changedCommentText() {
       return sprintf(
         __(
-          'This comment has changed since you started editing, please review the %{startTag}updated comment%{endTag} to ensure information is not lost.',
+          'This comment changed after you started editing it. Review the %{startTag}updated comment%{endTag} to ensure information is not lost.',
         ),
         {
           startTag: `<a href="${this.noteHash}" target="_blank" rel="noopener noreferrer">`,

locale/gitlab.pot

@@ -30556,7 +30556,7 @@ msgstr ""
 msgid "This chart could not be displayed"
 msgstr ""
 
-msgid "This comment has changed since you started editing, please review the %{startTag}updated comment%{endTag} to ensure information is not lost."
+msgid "This comment changed after you started editing it. Review the %{startTag}updated comment%{endTag} to ensure information is not lost."
 msgstr ""
 
 msgid "This commit is part of merge request %{link_to_merge_request}. Comments created here will be created in the context of that merge request."

spec/frontend/notes/components/note_form_spec.js

@@ -83,7 +83,7 @@ describe('issue_note_form component', () => {
       });
 
       const message =
-        'This comment has changed since you started editing, please review the updated comment to ensure information is not lost.';
+        'This comment changed after you started editing it. Review the updated comment to ensure information is not lost.';
 
       await nextTick();