summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-12 15:08:41 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-12 15:08:41 +0000
commit27859ed5eaeae234162b7cce7fd8bd351b5f9369 (patch)
tree5a62db348c3fd73516df87262c78e3546d4ec770 /locale
parent784fae4b9d7e92350075df2a43d06893080ed1e6 (diff)
downloadgitlab-ce-27859ed5eaeae234162b7cce7fd8bd351b5f9369.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot7
1 files changed, 5 insertions, 2 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 5315f4e0d1a..9c7dcdcae63 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -53,10 +53,10 @@ msgstr ""
msgid " or <!merge request id>"
msgstr ""
-msgid " or <#epic id>"
+msgid " or <#issue id>"
msgstr ""
-msgid " or <#issue id>"
+msgid " or <&epic id>"
msgstr ""
msgid " or references (e.g. path/to/project!merge_request_id)"
@@ -18254,6 +18254,9 @@ msgstr ""
msgid "Those emails automatically become issues (with the comments becoming the email conversation) listed here."
msgstr ""
+msgid "Threat Monitoring"
+msgstr ""
+
msgid "Thursday"
msgstr ""