diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-11-07 11:44:30 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-11-10 15:58:54 +0800 |
| commit | c28104196bab906362945ad38c01942dcb8ad2d2 (patch) | |
| tree | 35da0b35031075a5b6b497c8f386724e9a42d4d0 | |
| parent | 26f58cb4462e7f1df6d8dca73cc7391836d3f068 (diff) | |
| download | gitlab-ce-c28104196bab906362945ad38c01942dcb8ad2d2.tar.gz | |
Merge branch '39648-fix-gke-wording' into 'master'
Resolve "Fix GKE wording"
Closes #39648
See merge request gitlab-org/gitlab-ce!15204
| -rw-r--r-- | app/views/projects/clusters/_header.html.haml | 2 | ||||
| -rw-r--r-- | locale/gitlab.pot | 4 |
2 files changed, 3 insertions, 3 deletions
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 c73e582e608..ef011a310a5 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -375,7 +375,7 @@ msgstr "" msgid "Clone repository" 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 integration" @@ -447,7 +447,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|Save changes" |