summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-06-11 06:08:22 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-06-11 06:08:22 +0000
commit1b3eb6f388e2c376cc95adbd4babd8bad76eb4d6 (patch)
treea39034626ee95bed60ce943dcc44cc13102d793b /locale
parent7b0ffedd699f02990b1af3e6d84f914cb72659b1 (diff)
downloadgitlab-ce-1b3eb6f388e2c376cc95adbd4babd8bad76eb4d6.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot33
1 files changed, 30 insertions, 3 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 88e707836ce..afeecab9644 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1846,6 +1846,9 @@ msgstr ""
msgid "AlertManagement|Alert"
msgstr ""
+msgid "AlertManagement|Alert assignee(s): %{assignees}"
+msgstr ""
+
msgid "AlertManagement|Alert detail"
msgstr ""
@@ -1861,9 +1864,18 @@ msgstr ""
msgid "AlertManagement|All alerts"
msgstr ""
+msgid "AlertManagement|Assign Assignees"
+msgstr ""
+
msgid "AlertManagement|Assign status"
msgstr ""
+msgid "AlertManagement|Assignee"
+msgstr ""
+
+msgid "AlertManagement|Assignee(s)"
+msgstr ""
+
msgid "AlertManagement|Assignees"
msgstr ""
@@ -1903,6 +1915,9 @@ msgstr ""
msgid "AlertManagement|More information"
msgstr ""
+msgid "AlertManagement|No Matching Results"
+msgstr ""
+
msgid "AlertManagement|No alert data to display."
msgstr ""
@@ -1951,6 +1966,12 @@ msgstr ""
msgid "AlertManagement|There was an error displaying the alerts. Confirm your endpoint's configuration details to ensure alerts appear."
msgstr ""
+msgid "AlertManagement|There was an error while updating the assignee(s) list. Please try again."
+msgstr ""
+
+msgid "AlertManagement|There was an error while updating the assignee(s) of the alert. Please try again."
+msgstr ""
+
msgid "AlertManagement|There was an error while updating the status of the alert. Please try again."
msgstr ""
@@ -16318,6 +16339,9 @@ msgstr ""
msgid "Please provide a valid email address."
msgstr ""
+msgid "Please provide attributes to update"
+msgstr ""
+
msgid "Please refer to <a href=\"%{docs_url}\">%{docs_url}</a>"
msgstr ""
@@ -17221,6 +17245,9 @@ msgstr ""
msgid "ProjectSettings|Enable 'Delete source branch' option by default"
msgstr ""
+msgid "ProjectSettings|Enable merge trains and pipelines for merged results"
+msgstr ""
+
msgid "ProjectSettings|Every merge creates a merge commit"
msgstr ""
@@ -17287,9 +17314,6 @@ msgstr ""
msgid "ProjectSettings|Merge options"
msgstr ""
-msgid "ProjectSettings|Merge pipelines will try to validate the post-merge result prior to merging"
-msgstr ""
-
msgid "ProjectSettings|Merge requests"
msgstr ""
@@ -17317,6 +17341,9 @@ msgstr ""
msgid "ProjectSettings|Pipelines"
msgstr ""
+msgid "ProjectSettings|Pipelines for merge requests must be enabled in the CI/CD configuration file, or pipelines could be unresolvable or dropped"
+msgstr ""
+
msgid "ProjectSettings|Pipelines must succeed"
msgstr ""