diff options
| author | Fabio Busatto <fabio@gitlab.com> | 2017-11-07 11:44:29 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-11-07 11:44:29 +0000 |
| commit | a330d1bd18d785aa6e890ed3e1033657f6a9ddf6 (patch) | |
| tree | e00e934c3bea95b4bba291d5b1080015872ae8bd | |
| parent | 4338823416791c6039ce89069a1a91fd84f042b5 (diff) | |
| download | gitlab-ce-a330d1bd18d785aa6e890ed3e1033657f6a9ddf6.tar.gz | |
Resolve "Fix GKE wording"
| -rw-r--r-- | app/views/projects/clusters/_advanced_settings.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/clusters/_header.html.haml | 2 | ||||
| -rw-r--r-- | locale/gitlab.pot | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/clusters/_advanced_settings.html.haml b/app/views/projects/clusters/_advanced_settings.html.haml index 6c162481dd8..97532f1e2bd 100644 --- a/app/views/projects/clusters/_advanced_settings.html.haml +++ b/app/views/projects/clusters/_advanced_settings.html.haml @@ -10,5 +10,5 @@ %label.text-danger = s_('ClusterIntegration|Remove cluster integration') %p - = s_('ClusterIntegration|Removing cluster integration will remove the cluster configuration you have added to this project. It will not delete your project.') + = s_('ClusterIntegration|Removing cluster integration will remove the cluster configuration you have added to this project. It will not delete your cluster on Google Container Engine.') = link_to(s_('ClusterIntegration|Remove integration'), namespace_project_cluster_path(@project.namespace, @project, @cluster.id), method: :delete, class: 'btn btn-danger', data: { confirm: "Are you sure you want to remove cluster integration from this project? This will not delete your cluster on Google Container Engine"}) diff --git a/app/views/projects/clusters/_header.html.haml b/app/views/projects/clusters/_header.html.haml index 0134d46491c..beb798e7154 100644 --- a/app/views/projects/clusters/_header.html.haml +++ b/app/views/projects/clusters/_header.html.haml @@ -11,4 +11,4 @@ = s_('ClusterIntegration|Make sure your account %{link_to_requirements} to create clusters').html_safe % { link_to_requirements: link_to_requirements } %li - link_to_container_project = link_to(s_('ClusterIntegration|Google Container Engine project'), target: '_blank', rel: 'noopener noreferrer') - = s_('ClusterIntegration|A %{link_to_container_project} must have been created under this account').html_safe % { link_to_container_project: link_to_container_project } + = s_('ClusterIntegration|This account must have permissions to create a cluster in the %{link_to_container_project} specified below').html_safe % { link_to_container_project: link_to_container_project } diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 08f6212d997..32afb7b06e4 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -399,7 +399,7 @@ msgstr "" msgid "Cluster" msgstr "" -msgid "ClusterIntegration|A %{link_to_container_project} must have been created under this account" +msgid "ClusterIntegration|This account must have permissions to create a cluster in the %{link_to_container_project} specified below" msgstr "" msgid "ClusterIntegration|Cluster details" @@ -480,7 +480,7 @@ msgstr "" msgid "ClusterIntegration|Remove integration" msgstr "" -msgid "ClusterIntegration|Removing cluster integration will remove the cluster configuration you have added to this project. It will not delete your project." +msgid "ClusterIntegration|Removing cluster integration will remove the cluster configuration you have added to this project. It will not delete your cluster on Google Container Engine." msgstr "" msgid "ClusterIntegration|See and edit the details for your cluster" |