diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-11-06 15:43:24 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-11-06 15:43:24 +0000 |
| commit | 1208d55206128266690f46f0165df0fc10c24941 (patch) | |
| tree | 93fbdde5a5db6cdd8f79f2806707dab093985aa2 /locale/gitlab.pot | |
| parent | d171ff60168cd55b6d7b9ee920269f44a26e577e (diff) | |
| parent | d0c58a97c8a053c0beec7c13c1c6ec5042120ef1 (diff) | |
| download | gitlab-ce-refactor-snippets-finder.tar.gz | |
Merge branch 'master' into 'refactor-snippets-finder'refactor-snippets-finder
# Conflicts:
# spec/models/project_spec.rb
Diffstat (limited to 'locale/gitlab.pot')
| -rw-r--r-- | locale/gitlab.pot | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 324e5315821..3e35a5dbdf4 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 "" @@ -2172,7 +2169,7 @@ msgstr "" msgid "Define a custom pattern with cron syntax" msgstr "" -msgid "DelayedJobs|Are you sure you want to run %{jobName} immediately? This job will run automatically after it's timer finishes." +msgid "DelayedJobs|Are you sure you want to run %{jobName} immediately? Otherwise this job will run automatically after it's timer finishes." msgstr "" msgid "DelayedJobs|Are you sure you want to run %{job_name} immediately? This job will run automatically after it's timer finishes." @@ -4165,6 +4162,9 @@ msgstr "" msgid "Notes|Show comments only" msgstr "" +msgid "Notes|Show history only" +msgstr "" + msgid "Notification events" msgstr "" @@ -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 "" @@ -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 "" |