Add latest changes from gitlab-org/gitlab@master

1 files changed, 17 insertions, 10 deletions

diff --git a/app/views/help/instance_configuration/_ssh_info.html.haml b/app/views/help/instance_configuration/_ssh_info.html.haml
index 987cc61b3f6..a7ee37b2784 100644
--- a/app/views/help/instance_configuration/_ssh_info.html.haml
+++ b/app/views/help/instance_configuration/_ssh_info.html.haml
@@ -1,22 +1,29 @@
 - ssh_info = @instance_configuration.settings[:ssh_algorithms_hashes]
-- if ssh_info.any?
-  - content_for :table_content do
-    %li= link_to 'SSH host keys fingerprints', '#ssh-host-keys-fingerprints'
+- content_for :table_content do
+  %li
+    = link_to _('SSH host key fingerprints'), '#ssh-host-keys-fingerprints'
 
-  - content_for :settings_content do
-    %h2#ssh-host-keys-fingerprints
-      SSH host keys fingerprints
+- content_for :settings_content do
+  %h2#ssh-host-keys-fingerprints
+    = _('SSH host key fingerprints')
 
+  - if ssh_info.blank?
     %p
-      Below are the fingerprints for the current instance SSH host keys.
+      = _('SSH host keys are not available on this system. Please use <code>ssh-keyscan</code> command or contact your GitLab administrator for more information.').html_safe
+  - else
+    %p
+      = _('Below are the fingerprints for the current instance SSH host keys.')
 
     .table-responsive
       %table
         %thead
           %tr
-            %th Algorithm
-            %th MD5
-            %th SHA256
+            %th
+              = _('Algorithm')
+            %th
+              = _('MD5')
+            %th
+              = _('SHA256')
         %tbody
           - ssh_info.each do |algorithm|
             %tr