From fe083f505d907c1d1cef14c29170b31cf30192fe Mon Sep 17 00:00:00 2001 From: Mayra Cabrera Date: Tue, 23 Oct 2018 17:30:04 -0500 Subject: Removes experimental label from cluster views As part of https://gitlab.com/gitlab-org/gitlab-ce/issues/51716, we need to remove 'experimental' labels from cluster views (show and form), as well as the promp about cluster configuration, since it won't apply. These changes were originally introduced on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22011/, but we're trying to reduce the size of that MR as it's to big to review with confidence. --- locale/gitlab.pot | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'locale/gitlab.pot') diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 324e5315821..88f2c6fa010 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -1583,7 +1583,7 @@ msgstr "" msgid "ClusterIntegration|Prometheus is an open-source monitoring system with %{gitlabIntegrationLink} to monitor deployed applications." msgstr "" -msgid "ClusterIntegration|RBAC-enabled cluster (experimental)" +msgid "ClusterIntegration|RBAC-enabled cluster" msgstr "" msgid "ClusterIntegration|Read our %{link_to_help_page} on Kubernetes cluster integration." @@ -1655,9 +1655,6 @@ 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 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" msgstr "" -- cgit v1.2.1 From 00c7d78d49ab94f963e1e6b0bb0428b395aa036a Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Mon, 5 Nov 2018 13:22:25 +0000 Subject: [ci skip] Renders a warning block for archieved job When the job is archieved we render a affixed warning on the top of the job log --- locale/gitlab.pot | 3 +++ 1 file changed, 3 insertions(+) (limited to 'locale/gitlab.pot') diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 2f4b0e900c3..a29d4b9816f 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -6227,6 +6227,9 @@ msgstr "" msgid "This job is an out-of-date deployment to %{environmentLink}. View the most recent deployment %{deploymentLink}." msgstr "" +msgid "This job is archived. Only the complete pipeline can be retried." +msgstr "" + msgid "This job is creating a deployment to %{environmentLink} and will overwrite the %{deploymentLink}." msgstr "" -- cgit v1.2.1 From 31532b2d04e6647798cd3a6f72bcb40283341a9d Mon Sep 17 00:00:00 2001 From: Martin Wortschack Date: Tue, 6 Nov 2018 14:33:42 +0000 Subject: Resolve "Redesign activity feed" --- locale/gitlab.pot | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'locale/gitlab.pot') diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 1c4c9180c42..98417c08dfd 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -4641,9 +4641,6 @@ msgstr "" msgid "Profiles| You are going to change the username %{currentUsernameBold} to %{newUsernameBold}. Profile and projects will be redirected to the %{newUsername} namespace but this redirect will expire once the %{currentUsername} namespace is registered by another user or group. Please update your Git repository remotes as soon as possible." msgstr "" -msgid "Profiles|%{author_name} made a private contribution" -msgstr "" - msgid "Profiles|Account scheduled for removal." msgstr "" @@ -4704,6 +4701,9 @@ msgstr "" msgid "Profiles|Invalid username" msgstr "" +msgid "Profiles|Made a private contribution" +msgstr "" + msgid "Profiles|Main settings" msgstr "" -- cgit v1.2.1 From 0cf721bdd2752d20340c96e00e990936887c478c Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Tue, 6 Nov 2018 15:14:42 +0000 Subject: Disable stop environment button while deployment is running --- locale/gitlab.pot | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'locale/gitlab.pot') diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 98417c08dfd..3e35a5dbdf4 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -5847,6 +5847,9 @@ msgstr "" msgid "Status" msgstr "" +msgid "Stop environment" +msgstr "" + msgid "Stop impersonation" msgstr "" @@ -5856,6 +5859,9 @@ msgstr "" msgid "Stopped" msgstr "" +msgid "Stopping this environment is currently not possible as a deployment is in progress" +msgstr "" + msgid "Storage" msgstr "" -- cgit v1.2.1