summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-09-06 20:41:12 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-09-06 20:41:12 +0000
commit7aa6766cd15036dcfb5391b3fd7bffb9069ffbcf (patch)
tree77a2e46b99a89117331c7b52fd358d98b3375b19 /locale
parent051007498d553d16172120b2ab7a79d0f244545c (diff)
parent160b26df743e84b2e34f98f36ab2efc042dd9da6 (diff)
downloadgitlab-ce-7aa6766cd15036dcfb5391b3fd7bffb9069ffbcf.tar.gz
Merge branch '49632-clean-up-the-top-section-of-the-cluster-page' into 'master'
Resolve "Clean up the top section of the cluster page" Closes #49632 and #50490 See merge request gitlab-org/gitlab-ce!21550
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot28
1 files changed, 5 insertions, 23 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 00f9c6aa95a..9b78b9ad76f 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1332,10 +1332,7 @@ msgstr ""
msgid "ClusterIntegration|Certificate Authority bundle (PEM format)"
msgstr ""
-msgid "ClusterIntegration|Choose which of your project's environments will use this Kubernetes cluster."
-msgstr ""
-
-msgid "ClusterIntegration|Control how your Kubernetes cluster integrates with GitLab"
+msgid "ClusterIntegration|Choose which of your environments will use this cluster."
msgstr ""
msgid "ClusterIntegration|Copy API URL"
@@ -1362,6 +1359,9 @@ msgstr ""
msgid "ClusterIntegration|Did you know?"
msgstr ""
+msgid "ClusterIntegration|Enable or disable GitLab's connection to your Kubernetes cluster."
+msgstr ""
+
msgid "ClusterIntegration|Enable this setting if using role-based access control (RBAC)."
msgstr ""
@@ -1455,15 +1455,6 @@ msgstr ""
msgid "ClusterIntegration|Kubernetes cluster integration"
msgstr ""
-msgid "ClusterIntegration|Kubernetes cluster integration is disabled for this project."
-msgstr ""
-
-msgid "ClusterIntegration|Kubernetes cluster integration is enabled for this project."
-msgstr ""
-
-msgid "ClusterIntegration|Kubernetes cluster integration is enabled for this project. Disabling this integration will not affect your Kubernetes cluster, it will only temporarily turn off GitLab's connection to it."
-msgstr ""
-
msgid "ClusterIntegration|Kubernetes cluster is being created on Google Kubernetes Engine..."
msgstr ""
@@ -1488,12 +1479,6 @@ msgstr ""
msgid "ClusterIntegration|Learn more about %{help_link_start}zones%{help_link_end}."
msgstr ""
-msgid "ClusterIntegration|Learn more about environments"
-msgstr ""
-
-msgid "ClusterIntegration|Learn more about security configuration"
-msgstr ""
-
msgid "ClusterIntegration|Machine type"
msgstr ""
@@ -1581,9 +1566,6 @@ msgstr ""
msgid "ClusterIntegration|Search zones"
msgstr ""
-msgid "ClusterIntegration|Security"
-msgstr ""
-
msgid "ClusterIntegration|See and edit the details for your Kubernetes cluster"
msgstr ""
@@ -1623,7 +1605,7 @@ msgstr ""
msgid "ClusterIntegration|The IP address is in the process of being assigned. Please check your Kubernetes cluster or Quotas on Google Kubernetes Engine if it takes a long time."
msgstr ""
-msgid "ClusterIntegration|The default cluster configuration grants access to a wide set of functionalities needed to successfully build and deploy a containerised application."
+msgid "ClusterIntegration|The default cluster configuration grants access to many functionalities needed to successfully build and deploy a containerised application."
msgstr ""
msgid "ClusterIntegration|This account must have permissions to create a Kubernetes cluster in the %{link_to_container_project} specified below"