summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-18 03:09:43 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-18 03:09:43 +0000
commitb4b9b3854eddd2a4829113ebfc1812c3a332a7d9 (patch)
tree6a21e491917e1606d81329af710459b0217eb1a4 /locale
parent2e31c85a97183814ffa7ba5cc58f7bbad668fb2b (diff)
downloadgitlab-ce-b4b9b3854eddd2a4829113ebfc1812c3a332a7d9.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot14
1 files changed, 4 insertions, 10 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index d0c2f4b2906..11f93ac0bce 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -711,9 +711,6 @@ msgstr ""
msgid "20-29 contributions"
msgstr ""
-msgid "24 hours"
-msgstr ""
-
msgid "2FA"
msgstr ""
@@ -726,9 +723,6 @@ msgstr ""
msgid "3 hours"
msgstr ""
-msgid "30 days"
-msgstr ""
-
msgid "30 minutes"
msgstr ""
@@ -750,9 +744,6 @@ msgstr ""
msgid "404|Please contact your GitLab administrator if you think this is a mistake."
msgstr ""
-msgid "7 days"
-msgstr ""
-
msgid "8 hours"
msgstr ""
@@ -7660,6 +7651,9 @@ msgstr ""
msgid "EnvironmentsDashboard|This dashboard displays a maximum of 7 projects and 3 environments per project. %{readMoreLink}"
msgstr ""
+msgid "Environments|All pods"
+msgstr ""
+
msgid "Environments|An error occurred while canceling the auto stop, please try again"
msgstr ""
@@ -7741,7 +7735,7 @@ msgstr ""
msgid "Environments|No deployments yet"
msgstr ""
-msgid "Environments|No pods to display"
+msgid "Environments|No pod selected"
msgstr ""
msgid "Environments|Note that this action will stop the environment, but it will %{emphasisStart}not%{emphasisEnd} have an effect on any existing deployment due to no “stop environment action” being defined in the %{ciConfigLinkStart}.gitlab-ci.yml%{ciConfigLinkEnd} file."