Better wording for SSH host keys importing

yast · May 17, 2016 · 5abe13c · 5abe13c
1 parent 2ba8fbe
commit 5abe13c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/lib/installation/clients/ssh_import_proposal.rb b/src/lib/installation/clients/ssh_import_proposal.rb
@@ -17,9 +17,9 @@ def initialize
     def description
       {
         # proposal part - bootloader label
-        "rich_text_title" => _("Import SSH Keys and Configuration"),
+        "rich_text_title" => _("Import SSH Host Keys and Configuration"),
         # menubutton entry
-        "menu_title"      => _("&Import SSH Keys and Configuration"),
+        "menu_title"      => _("&Import SSH Host Keys and Configuration"),
         "id"              => "ssh_import"
       }
     end
@@ -41,18 +41,18 @@ def preformatted_proposal
         return _("No previous Linux installation found - not importing any SSH Key")
       end
       if importer.device.nil?
-        res = _("No existing SSH keys will be copied")
+        res = _("No existing SSH host keys will be copied")
       else
         ssh_config = importer.configurations[importer.device]
         partition = ssh_config.system_name
         if importer.copy_config?
           # TRANSLATORS: %s is the name of a Linux system found in the hard
           # disk, like 'openSUSE 13.2'
-          res = _("SSH keys and configuration will be copied from %s") % partition
+          res = _("SSH host keys and configuration will be copied from %s") % partition
         else
           # TRANSLATORS: %s is the name of a Linux system found in the hard
           # disk, like 'openSUSE 13.2'
-          res = _("SSH keys will be copied from %s") % partition
+          res = _("SSH host keys will be copied from %s") % partition
         end
       end
       # TRANSLATORS: link to change the proposal

diff --git a/src/lib/installation/dialogs/ssh_import.rb b/src/lib/installation/dialogs/ssh_import.rb
@@ -63,7 +63,7 @@ def copy_config
     def dialog_content
       HSquash(
         VBox(
-          Left(Label(_("System to Import SSH Keys from"))),
+          Left(Label(_("System to Import SSH Host Keys from"))),
           partitions_list_widget,
           VSpacing(1),
           Left(copy_config_widget)
@@ -72,14 +72,16 @@ def dialog_content
     end
 
     def dialog_title
-      _("Import SSH Keys and Configuration")
+      _("Import SSH Host Keys and Configuration")
     end
 
     def help_text
       _(
-        "<p>Choose an existing Linux installation to reuse the keys of its SSH " \
-        "server. The key files found in /etc/ssh will be copied to the new " \
-        "system being installed.</p>" \
+        "<p>Every SSH server is identified by one or several public host keys. " \
+        "Choose an existing Linux installation to reuse the host keys -and " \
+        "thus the identity- of its SSH server. The key files found in /etc/ssh " \
+        "(one pair of files per host key) will be copied to the new system " \
+        "being installed.</p>" \
         "<p>Check <b>Copy Whole SSH Configuration</b> to also copy other files " \
         "found in /etc/ssh, in addition to the keys.</p>"
       )