diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-11-07 05:21:25 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-11-07 05:21:25 +0000 |
| commit | 839a654ef0da5f13729074e24231344fe64a2cdc (patch) | |
| tree | 6dff019a9ea6164af7c9721ca2cb2ba30b886002 /locale/gitlab.pot | |
| parent | 0a4eeafb43236359c55e221bdc8cab52acef9a0f (diff) | |
| parent | cf8fe12b7b3a24082db47f71c80b01e62e391f32 (diff) | |
| download | gitlab-ce-gl-ui-loading-icon.tar.gz | |
Merge branch 'master' into 'gl-ui-loading-icon'gl-ui-loading-icon
# Conflicts:
# app/assets/javascripts/jobs/components/job_app.vue
Diffstat (limited to 'locale/gitlab.pot')
| -rw-r--r-- | locale/gitlab.pot | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 2f4b0e900c3..45fc072900a 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 "" @@ -4644,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 "" @@ -4707,6 +4701,9 @@ msgstr "" msgid "Profiles|Invalid username" msgstr "" +msgid "Profiles|Made a private contribution" +msgstr "" + msgid "Profiles|Main settings" msgstr "" @@ -5850,6 +5847,9 @@ msgstr "" msgid "Status" msgstr "" +msgid "Stop environment" +msgstr "" + msgid "Stop impersonation" msgstr "" @@ -5859,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 "" @@ -6227,6 +6230,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 "" |