summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2019-02-07 16:47:33 +0000
committerSean McGivern <sean@gitlab.com>2019-02-07 16:47:33 +0000
commitaa2fe07db2e6a0e3dc92a06e61d1a9518adadebc (patch)
treeeb926f01f7bb23d09e50b2b8e7ecd1983819c14a /locale
parent68f9453c66b50b1478af79a3db906c41fc8cc658 (diff)
parent8bf5e4795db1915552c1b999ee0c4a9c00466526 (diff)
downloadgitlab-ce-aa2fe07db2e6a0e3dc92a06e61d1a9518adadebc.tar.gz
Merge branch '19745-new-tasklists-for-merge-requests' into 'master'
Enable fast task lists for merge requests Closes #19745 See merge request gitlab-org/gitlab-ce!24779
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot5
1 files changed, 4 insertions, 1 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index efaaddfbaa1..937db5b7305 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -6643,7 +6643,10 @@ msgstr ""
msgid "Snippets"
msgstr ""
-msgid "Someone edited this issue at the same time you did. The description has been updated and you will need to make your changes again."
+msgid "Someone edited this %{issueType} at the same time you did. The description has been updated and you will need to make your changes again."
+msgstr ""
+
+msgid "Someone edited this merge request at the same time you did. Please refresh the page to see changes."
msgstr ""
msgid "Something went wrong on our end"