Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 10 deletions

diff --git a/app/views/help/instance_configuration/_gitlab_pages.html.haml b/app/views/help/instance_configuration/_gitlab_pages.html.haml
index 94c25edaf82..55f043214f6 100644
--- a/app/views/help/instance_configuration/_gitlab_pages.html.haml
+++ b/app/views/help/instance_configuration/_gitlab_pages.html.haml
@@ -1,35 +1,35 @@
 - gitlab_pages = @instance_configuration.settings[:gitlab_pages]
 - content_for :table_content do
-  %li= link_to 'GitLab Pages', '#gitlab-pages'
+  %li= link_to _('GitLab Pages'), '#gitlab-pages'
 
 - content_for :settings_content do
   %h2#gitlab-pages
-    GitLab Pages
+    = _('GitLab Pages')
 
   %p
-    Below are the settings for
-    = succeed('.') { link_to('GitLab Pages', gitlab_pages[:url], target: '_blank') }
+    - link_to_gitlab_pages = link_to(_('GitLab Pages'), gitlab_pages[:url], target: '_blank')
+    = _('Below are the settings for %{link_to_gitlab_pages}.').html_safe % { link_to_gitlab_pages: link_to_gitlab_pages }
   .table-responsive
     %table
       %thead
         %tr
-          %th Setting
+          %th= _('Setting')
           %th= instance_configuration_host(@instance_configuration.settings[:host])
       %tbody
         %tr
-          %td Domain Name
+          %td= _('Domain Name')
           %td
             %code= instance_configuration_cell_html(gitlab_pages[:host])
         %tr
-          %td IP Address
+          %td= _('IP Address')
           %td
             %code= instance_configuration_cell_html(gitlab_pages[:ip_address])
         %tr
-          %td Port
+          %td= _('Port')
           %td
             %code= instance_configuration_cell_html(gitlab_pages[:port])
   %br
 
   %p
-    The maximum size of your Pages site is regulated by the artifacts maximum
-    size which is part of #{succeed('.') { link_to('GitLab CI', '#gitlab-ci') }}
+    - link_to_gitlab_ci = link_to(_('GitLab CI'), '#gitlab-ci')
+    = _("The maximum size of your Pages site is regulated by the artifacts maximum size which is part of %{link_to_gitlab_ci}.").html_safe % { link_to_gitlab_ci: link_to_gitlab_ci }