reformat help text, fix typo

yast · Jun 23, 2015 · c13dfb2 · c13dfb2
1 parent 2fe2b8e
commit c13dfb2
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 15 deletions.
diff --git a/src/include/iscsi-client/helps.rb b/src/include/iscsi-client/helps.rb
@@ -88,18 +88,20 @@ def initialize_iscsi_client_helps(include_target)
           ),
         # table of connected targets
         "server_table"   => _(
-          "<p>List of current sessions.<br>
-Use the <b>Add</b> button to get additional targets. A discovery is started to detect new targets and the start-up mode of already connected targets keeps unchanged.<br>
-Use <b>Log Out</b> to cancel the connection and with it remove the target from list.\n
-To change the start-up status, press <b>Edit</b>.</p>"
+          "<p>List of current sessions.</p>" \
+            "<p>Use the <b>Add</b> button to get additional targets. A discovery is started to " \
+            "detect new targets and the start-up mode of already connected targets keeps " \
+            "unchanged.<br>" \
+            "Use <b>Log Out</b> to cancel the connection and with it remove the target from the list.<br>" \
+            "To change the start-up status, press <b>Edit</b>.</p>"
         ) +
           # Warning
           _("<h1>Warning</h1>") +
           _(
             "<p>When accessing an iSCSI device <b>READ</b>/<b>WRITE</b>, make sure that this access is exclusive. Otherwise there is a potential risk of data corruption.</p>\n"
           ),
         "initiator_name" => _(
-          "<p><b>InitiatorName</b> is a value from <tt>/etc/iscsi/initiatorname.iscsi</tt>. \nIn case you have iBFT, this value will be added from there and you are only able to change it in the BIOS setup.</p>"
+          "<p><b>Initiator Name</b> is a value from <tt>/etc/iscsi/initiatorname.iscsi</tt>. \nIn case you have iBFT, this value will be added from there and you are only able to change it in the BIOS setup.</p>"
         ),
         "isns"           => _(
           "If you want to use <b>iSNS</b> (Internet  Storage  Name Service) for discovering targets instead of the default SendTargets method,\nfill in the IP address of the iSNS server and port. The default port should be 3205.\n"
@@ -141,15 +143,20 @@ def initialize_iscsi_client_helps(include_target)
           ),
         # list of discovered targets
         "discovered"     => _(
-          "<p>This screen shows the list of discovered targets.<br>
-Use the <b>Discovery</b> button to get available iSCSI targets (from server specified in pop-up).<br>
-<b>Log In</b> to a target to establih the connection. If login was successful the column <i>Connected</i> shows status 'True' and the target will appear on the <i>Connected Targets</i> screen.<br>
-<b>Please note:</b> Starting the <b>Discovery</b> again means doing a re-discovery of targets which possibly will change the start-up mode of already connected targets (to default 'manual').
-Switch to <i>Connected Targets</i> screen and use the <b>Add</b> button if you want to add new targets without changing the start-up mode.<br>
-To remove a target use the <b>Delete</b> button. <b>Hint:</b>
-Removing of targets is only possible for not connected onces. If required <b>Log Out</b> at <i>Connected Targets</i>
-first.</p>"
-
+          "<p>This screen shows the list of discovered targets.</p>" \
+          "<p>Use the <b>Discovery</b> button to get available iSCSI targets (from server " \
+          "specified in pop-up).<br>" \
+          "<b>Log In</b> to a target to establih the connection. If login was successful " \
+          "the column <i>Connected</i> shows status 'True' and the target will appear on " \
+          "the <i>Connected Targets</i> screen.<p>" \
+          "<p><b>Please note:</b> Starting the <b>Discovery</b> again means doing a re-discovery "\
+          "of targets which possibly will change the start-up mode of already connected targets " \
+          "(to default 'manual'). " \
+          "Switch to <i>Connected Targets</i> screen and use the <b>Add</b> button if you want " \
+          "to add new targets without changing the start-up mode.</p>" \
+          "<p>To remove a target use the <b>Delete</b> button.<br> <b>Hint:</b> " \
+          "Removing of targets is only possible for not connected onces. " \
+          "If required, <b>Log Out</b> at <i>Connected Targets</i> first.</p>"
         ),
         "ibft_table"     => _("<h1>iBTF</h1>") +
           "The <p>iSCSI Boot Firmware Table</p> is a table created by the iSCSI boot firmware in order to\npass parameters about the iSCSI boot device to the loaded OS."

diff --git a/src/include/iscsi-client/widgets.rb b/src/include/iscsi-client/widgets.rb
@@ -425,7 +425,7 @@ def validateInitName(key, event)
         Builtins.regexpmatch(i_name, Builtins.sformat("^eui.%1%2$", reg1, reg2))
 
       if !correct
-        go_on = Popup.YesNoHeadline( _("Incorrect InitiatorName"),
+        go_on = Popup.YesNoHeadline( _("Incorrect Initiator Name"),
           _(
             "\n" +
             "The correct syntax is\n" +