summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-08 09:09:17 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-08 09:09:17 +0000
commit21341457a8c422d890a9ec30838b597dea565d62 (patch)
treeaa8aca2a9bce4e16936cc8d7b40aa1c79ca82e35 /locale
parent0a319374e7784aa5c2d1c30dd832d2a0509edbab (diff)
downloadgitlab-ce-21341457a8c422d890a9ec30838b597dea565d62.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot33
1 files changed, 27 insertions, 6 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index cbf29779c11..58f2d7845cf 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -16,9 +16,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-msgid " AlertSettings|URL cannot be blank and must start with http or https"
-msgstr ""
-
msgid " %{start} to %{end}"
msgstr ""
@@ -2086,15 +2083,24 @@ msgstr ""
msgid "AlertSettings|Add URL and auth key to your Prometheus config file"
msgstr ""
+msgid "AlertSettings|Alert test payload"
+msgstr ""
+
msgid "AlertSettings|Alerts endpoint successfully activated."
msgstr ""
msgid "AlertSettings|Authorization key"
msgstr ""
+msgid "AlertSettings|Authorization key has been successfully reset"
+msgstr ""
+
msgid "AlertSettings|Copy"
msgstr ""
+msgid "AlertSettings|Enter test alert JSON...."
+msgstr ""
+
msgid "AlertSettings|External Prometheus"
msgstr ""
@@ -2119,6 +2125,15 @@ msgstr ""
msgid "AlertSettings|Review your external service's documentation to learn where to provide this information to your external service, and the %{linkStart}GitLab documentation%{linkEnd} to learn more about configuring your endpoint."
msgstr ""
+msgid "AlertSettings|Test alert payload"
+msgstr ""
+
+msgid "AlertSettings|Test alert sent successfully. If you have made other changes, please save them now."
+msgstr ""
+
+msgid "AlertSettings|Test failed. Do you still want to save your changes anyway?"
+msgstr ""
+
msgid "AlertSettings|There was an error updating the the alert settings. Please refresh the page to try again."
msgstr ""
@@ -2128,6 +2143,9 @@ msgstr ""
msgid "AlertSettings|There was an error while trying to reset the key. Please refresh the page to try again."
msgstr ""
+msgid "AlertSettings|URL cannot be blank and must start with http or https"
+msgstr ""
+
msgid "AlertSettings|Webhook URL"
msgstr ""
@@ -2137,6 +2155,9 @@ msgstr ""
msgid "AlertSettings|You must provide this URL and authorization key to authorize an external service to send alerts to GitLab. You can provide this URL and key to multiple services. After configuring an external service, alerts from your service will display on the GitLab %{linkStart}Alerts%{linkEnd} page."
msgstr ""
+msgid "AlertSettings|Your changes were successfully updated."
+msgstr ""
+
msgid "AlertSettings|http://prometheus.example.com/"
msgstr ""
@@ -19939,9 +19960,6 @@ msgstr ""
msgid "Save Changes"
msgstr ""
-msgid "Save and test changes"
-msgstr ""
-
msgid "Save anyway"
msgstr ""
@@ -27941,6 +27959,9 @@ msgstr ""
msgid "opened %{timeAgoString} by %{user}"
msgstr ""
+msgid "opened %{timeAgoString} by %{user} in Jira"
+msgstr ""
+
msgid "opened %{timeAgo}"
msgstr ""