summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-10 15:08:08 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-10 15:08:08 +0000
commit7c38405be9e79099f399aa429503ea7b463bbf5a (patch)
tree30944a8baf135021395574e081f53ed5f756ace0 /locale
parent1fa79760ad2d4bd67f5c5a27f372a7533b9b7c69 (diff)
downloadgitlab-ce-7c38405be9e79099f399aa429503ea7b463bbf5a.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 ef0ce1bbad6..b0960e66ea7 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -2038,6 +2038,9 @@ msgstr ""
msgid "Anonymous"
msgstr ""
+msgid "Another action is currently in progress"
+msgstr ""
+
msgid "Another issue tracker is already in use. Only one issue tracker service can be active at a time"
msgstr ""
@@ -2283,6 +2286,9 @@ msgstr ""
msgid "Are you sure you want to delete this pipeline? Doing so will expire all pipeline caches and delete all related objects, such as builds, logs, artifacts, and triggers. This action cannot be undone."
msgstr ""
+msgid "Are you sure you want to deploy this environment?"
+msgstr ""
+
msgid "Are you sure you want to erase this build?"
msgstr ""
@@ -2298,6 +2304,9 @@ msgstr ""
msgid "Are you sure you want to permanently delete this license?"
msgstr ""
+msgid "Are you sure you want to re-deploy this environment?"
+msgstr ""
+
msgid "Are you sure you want to regenerate the public key? You will have to update the public key on the remote server before mirroring will work again."
msgstr ""
@@ -12799,6 +12808,15 @@ msgstr ""
msgid "Moves this issue to %{path_to_project}."
msgstr ""
+msgid "MrDeploymentActions|Deploy"
+msgstr ""
+
+msgid "MrDeploymentActions|Re-deploy"
+msgstr ""
+
+msgid "MrDeploymentActions|Stop environment"
+msgstr ""
+
msgid "Multiple issue boards"
msgstr ""
@@ -18243,6 +18261,9 @@ msgstr ""
msgid "Something went wrong while deleting your note. Please try again."
msgstr ""
+msgid "Something went wrong while deploying this environment. Please try again."
+msgstr ""
+
msgid "Something went wrong while editing your comment. Please try again."
msgstr ""
@@ -18741,9 +18762,6 @@ msgstr ""
msgid "Stop Terminal"
msgstr ""
-msgid "Stop environment"
-msgstr ""
-
msgid "Stop impersonation"
msgstr ""
@@ -18753,9 +18771,6 @@ msgstr ""
msgid "Stopped"
msgstr ""
-msgid "Stopping this environment is currently not possible as a deployment is in progress"
-msgstr ""
-
msgid "Stopping..."
msgstr ""
@@ -20002,6 +20017,12 @@ msgstr ""
msgid "This environment has no deployments yet."
msgstr ""
+msgid "This environment is being deployed"
+msgstr ""
+
+msgid "This environment is being re-deployed"
+msgstr ""
+
msgid "This epic already has the maximum number of child epics."
msgstr ""