summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorKushal Pandya <kushalspandya@gmail.com>2019-02-21 11:21:36 +0000
committerKushal Pandya <kushalspandya@gmail.com>2019-02-21 11:21:36 +0000
commit98dbde0c3ffa5c098dd4e765636e0ac3b243d220 (patch)
treef2b1ce0c02cde6153505185e36397dddd4ca1a12 /locale
parentcb0c7c3cdb0c860d6676e916027fb5e92522f268 (diff)
parent3f2ecb542b4cdd493bfa67f00b94f58b901c62fb (diff)
downloadgitlab-ce-98dbde0c3ffa5c098dd4e765636e0ac3b243d220.tar.gz
Merge branch 'mind-the-oxford-comma' into 'master'
Mind the oxford comma See merge request gitlab-org/gitlab-ce!25252
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot2
1 files changed, 1 insertions, 1 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 457b393561e..4c064b7741a 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -4115,7 +4115,7 @@ msgstr ""
msgid "Issues can be bugs, tasks or ideas to be discussed. Also, issues are searchable and filterable."
msgstr ""
-msgid "Issues, merge requests, pushes and comments."
+msgid "Issues, merge requests, pushes, and comments."
msgstr ""
msgid "It must have a header row and at least two columns: the first column is the issue title and the second column is the issue description. The separator is automatically detected."