Merge branch 'fix6' into 'master'

Change plural "merge request" to "merge requests" See merge request gitlab-org/gitlab!67746

Merge branch 'fix6' into 'master'
Change plural "merge request" to "merge requests" See merge request gitlab-org/gitlab!67746
bc0a1bb5 · Martin Wortschack · b4008c6d · 1b178783 · bc0a1bb5 · bc0a1bb5
Commit bc0a1bb5 authored Aug 25, 2021 by Martin Wortschack
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

app/assets/javascripts/issuable/components/csv_export_modal.vue ...sets/javascripts/issuable/components/csv_export_modal.vue +1 -1

locale/gitlab.pot locale/gitlab.pot +1 -1

No files found.
--- a/app/assets/javascripts/issuable/components/csv_export_modal.vue
+++ b/app/assets/javascripts/issuable/components/csv_export_modal.vue
@@ -63,7 +63,7 @@ export default {
        </gl-sprintf>
        <gl-sprintf
          v-else
-          :message="n__('1 merge request selected', '%d merge request selected', issuableCount)"
+          :message="n__('1 merge request selected', '%d merge requests selected', issuableCount)"
        >
          <template #issuableCount>{{ issuableCount }}</template>
        </gl-sprintf>

--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1263,7 +1263,7 @@ msgstr[0] ""
 msgstr[1] ""

 msgid "1 merge request selected"
-msgid_plural "%d merge request selected"
+msgid_plural "%d merge requests selected"
 msgstr[0] ""
 msgstr[1] ""