summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-04 06:08:23 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-04 06:08:23 +0000
commitbe81c1578d65f25edfde8aa550f190b8d3e6d976 (patch)
tree0695fcaec3739d0ba486985bae2ebd85a3f49ee5 /locale
parentbb19d18713d1b3da7d564826f5e21e8d9f9f36cd (diff)
downloadgitlab-ce-be81c1578d65f25edfde8aa550f190b8d3e6d976.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot16
1 files changed, 14 insertions, 2 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 08b7ec47129..d3b7fea73c9 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1862,6 +1862,9 @@ msgstr ""
msgid "An error occurred while loading chart data"
msgstr ""
+msgid "An error occurred while loading clusters"
+msgstr ""
+
msgid "An error occurred while loading commit signatures"
msgstr ""
@@ -3962,6 +3965,9 @@ msgstr ""
msgid "Cluster does not exist"
msgstr ""
+msgid "Cluster level"
+msgstr ""
+
msgid "ClusterIntegration| %{custom_domain_start}More information%{custom_domain_end}."
msgstr ""
@@ -7454,6 +7460,9 @@ msgstr ""
msgid "Environment does not have deployments"
msgstr ""
+msgid "Environment scope"
+msgstr ""
+
msgid "Environment variables are applied to environments via the runner. They can be protected by only exposing them to protected branches or tags. Additionally, they can be masked so they are hidden in job logs, though they must match certain regexp requirements to do so. You can use environment variables for passwords, secret keys, or whatever you want."
msgstr ""
@@ -11181,6 +11190,9 @@ msgstr ""
msgid "Kubernetes Clusters"
msgstr ""
+msgid "Kubernetes cluster"
+msgstr ""
+
msgid "Kubernetes cluster creation time exceeds timeout; %{timeout}"
msgstr ""
@@ -17192,10 +17204,10 @@ msgstr ""
msgid "Security dashboard"
msgstr ""
-msgid "Security report is out of date. Please incorporate latest changes from %{targetBranchName}"
+msgid "Security report is out of date. Please update your branch with the latest changes from the target branch (%{targetBranchName})"
msgstr ""
-msgid "Security report is out of date. Retry the pipeline for the target branch."
+msgid "Security report is out of date. Run %{newPipelineLinkStart}a new pipeline%{newPipelineLinkEnd} for the target branch (%{targetBranchName})"
msgstr ""
msgid "SecurityConfiguration|Configured"