summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-09 18:10:09 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-09 18:10:09 +0000
commitf67f18d9492786e635e942beefa63d41f4c35765 (patch)
tree7fb6cf67d62508295b2e79f4041474ed4aa16f29 /locale
parent4a14cfd1959c6a03758d0a75afe7b4277cf113ec (diff)
downloadgitlab-ce-f67f18d9492786e635e942beefa63d41f4c35765.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot29
1 files changed, 28 insertions, 1 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 343119acc62..a7d378b8eba 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1998,6 +1998,12 @@ msgstr ""
msgid "AlertManagement|Medium"
msgstr ""
+msgid "AlertManagement|Metrics"
+msgstr ""
+
+msgid "AlertManagement|Metrics weren't available in the alerts payload."
+msgstr ""
+
msgid "AlertManagement|More information"
msgstr ""
@@ -9883,7 +9889,7 @@ msgstr ""
msgid "FeatureFlags|Edit list"
msgstr ""
-msgid "FeatureFlags|Enable features for specific users and specific environments by defining feature flag strategies. By default, features are available to all users in all environments."
+msgid "FeatureFlags|Enable features for specific users and specific environments by defining feature flag strategies."
msgstr ""
msgid "FeatureFlags|Environment Spec"
@@ -10660,6 +10666,24 @@ msgstr ""
msgid "Geo|All projects are being scheduled for reverify"
msgstr ""
+msgid "Geo|Allowed Geo IP can't be blank"
+msgstr ""
+
+msgid "Geo|Allowed Geo IP should be between 1 and 255 characters"
+msgstr ""
+
+msgid "Geo|Allowed Geo IP should contain valid IP addresses"
+msgstr ""
+
+msgid "Geo|Connection timeout can't be blank"
+msgstr ""
+
+msgid "Geo|Connection timeout must be a number"
+msgstr ""
+
+msgid "Geo|Connection timeout should be between 1-120"
+msgstr ""
+
msgid "Geo|Could not remove tracking entry for an existing project."
msgstr ""
@@ -23419,6 +23443,9 @@ msgstr ""
msgid "There was an error trying to validate your query"
msgstr ""
+msgid "There was an error updating the Geo Settings"
+msgstr ""
+
msgid "There was an error updating the dashboard, branch name is invalid."
msgstr ""