Author: jsrain Date: Fri Apr 18 15:05:33 2008 New Revision: 46841 URL: http://svn.opensuse.org/viewcvs/yast?rev=46841&view=rev Log: merged texts from proofread Modified: trunk/iscsi-client/VERSION trunk/iscsi-client/package/yast2-iscsi-client.changes trunk/iscsi-client/src/IscsiClientLib.ycp trunk/iscsi-client/src/helps.ycp trunk/iscsi-client/src/widgets.ycp Modified: trunk/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/VERSION?rev=46841&r1=46840&r2=46841&view=diff ============================================================================== --- trunk/iscsi-client/VERSION (original) +++ trunk/iscsi-client/VERSION Fri Apr 18 15:05:33 2008 @@ -1 +1 @@ -2.16.9 +2.16.10 Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi-client.changes?rev=46841&r1=46840&r2=46841&view=diff ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Fri Apr 18 15:05:33 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 18 14:37:28 CEST 2008 - jsrain@suse.cz + +- merged texts from proofread +- 2.16.10 + +------------------------------------------------------------------- Mon Mar 17 12:43:32 CET 2008 - jsrain@suse.cz - added 'StartupNotify=true' to the desktop file (bnc #304964) Modified: trunk/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.ycp?rev=46841&r1=46840&r2=46841&view=diff ============================================================================== --- trunk/iscsi-client/src/IscsiClientLib.ycp (original) +++ trunk/iscsi-client/src/IscsiClientLib.ycp Fri Apr 18 15:05:33 2008 @@ -281,7 +281,9 @@ sformat("grep -v '^#' %1 | cut -d'=' -f2 | tr -d '\n'", file)))["stdout"]:""; if (size(name_from_bios)>0 && name_from_bios!=initiatorname) { - Popup::Warning( _("InitiatorName from iBFT and from /etc/iscsi/initiatorname.iscsi are differ.\nOld initiatorname will be replaced by value from iBFT and create a backup.\nIf you want to use different initiatorname change it in BIOS.") ); + Popup::Warning( _("InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt> differ. +The old initiatorname will be replaced by the value of iBFT and create a backup. +If you want to use a different initiatorname, change it in the BIOS.") ); y2milestone("replacing old name %1 by name %2 from iBFT", initiatorname, name_from_bios); initiatorname = name_from_bios; ret = writeInitiatorName(initiatorname); Modified: trunk/iscsi-client/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/helps.ycp?rev=46841&r1=46840&r2=46841&view=diff ============================================================================== --- trunk/iscsi-client/src/helps.ycp (original) +++ trunk/iscsi-client/src/helps.ycp Fri Apr 18 15:05:33 2008 @@ -74,19 +74,20 @@ "), // table of connected targets - "server_table" : _("List of current sessions. To add a new target, press <b>Add</b>. -To remove one, select it and press <b>Log Out</b>. -To change start-up status, press <b>Toggle</b>. + "server_table" : _("List of current sessions. To add a new target, select it and press <b>Add</b>. +To remove it, press <b>Log Out</b>. +To change the start-up status, press <b>Toggle</b>. ") + /* 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> "), - "initiator_name" : _("<p><b>InitiatorName</b> is value from /etc/initiatorname.iscsi. In case you have iBFT this value will be replaced from there and you are not able to change it (do it in BIOS Setup).</p>"), + "initiator_name" : _("<p><b>InitiatorName</b> is value a from <tt>/etc/initiatorname.iscsi</tt>. \nIn case you have iBFT, this value will be added from there and you are able to change it only in the BIOS setup.</p>"), - "isns" : _("If you want to use <b>iSNS</b> (Internet Storage Name Service) for discovering targets instead of default SendTargets method, -fill IP address of iSNS server and port. Default port should be 3205."), + "isns" : _("If you want to use <b>iSNS</b> (Internet Storage Name Service) for discovering targets instead of the default SendTargets method, +fill in the IP address of the iSNS server and port. The default port should be 3205. +"), // discovery new target "discovery" : _("<h1>iSCSI Initiator</h1>") + _("Enter the <b>IP Address</b> of the discovered server. Modified: trunk/iscsi-client/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/widgets.ycp?rev=46841&r1=46840&r2=46841&view=diff ============================================================================== --- trunk/iscsi-client/src/widgets.ycp (original) +++ trunk/iscsi-client/src/widgets.ycp Fri Apr 18 15:05:33 2008 @@ -24,7 +24,7 @@ integer sleep_step = 20; while (cont_loop && ((boolean) SCR::Read(.background.output_open))) { if (time_spent >= script_time_out) { - Popup::Error(_("Command timed-out")); + Popup::Error(_("Command timed out")); cont_loop = false; } time_spent = time_spent + sleep_step; @@ -186,12 +186,12 @@ string port = (string)UI::QueryWidget(`isns_port, `Value); if (size(address)==0 && size(port)==0) return true; if(!IP::Check4(address)){ - Popup::Error(_("Not valid IP address")); + Popup::Error(_("No valid IP address")); UI::SetFocus(`isns_address); return false; } if (size(port)==0){ - Popup::Error(_("Port field can't be empty")); + Popup::Error(_("Port field cannot be empty")); UI::SetFocus(`isns_port); return false; } @@ -261,8 +261,8 @@ boolean correct = regexpmatch(i_name, sformat("%1%2%3\$", reg1, reg2, reg3)); - if (!correct) Popup::Warning(_("Incorrect InitiatorName -Correct syntax is + if (!correct) Popup::Warning(_("Incorrect InitiatorName. +The correct syntax is iqn.yyyy-mm.reversed domain name[:identifier] Example: @@ -490,7 +490,7 @@ if ( event["ID"]:nil == `connect) { // check if not already connected if ( IscsiClientLib::connected( curr_rec , false) == true){ - if (!Popup::AnyQuestion(Label::WarningMsg(), _("The target with this TargetName is already connected. Make sure that Multipathing is enabled to prevent data corruption."), _("Continue"), _("Cancel"), `focus_yes)) return nil; + if (!Popup::AnyQuestion(Label::WarningMsg(), _("The target with this TargetName is already connected. Make sure that multipathing is enabled to prevent data corruption."), _("Continue"), _("Cancel"), `focus_yes)) return nil; } // goto ConnAuthDialog("discovered") (initDiscAuth) @@ -549,7 +549,7 @@ curr_rec = [ splitstring(params[0]:"", ",")[0]:"", params[1]:"" ]; // check if not already connected if ( IscsiClientLib::connected( curr_rec , false) == true){ - if (!Popup::AnyQuestion(Label::WarningMsg(), _("The target with this TargetName is already connected. Make sure that Multipathing is enabled to prevent data corruption."), _("Continue"), _("Cancel"), `focus_yes)) return nil; + if (!Popup::AnyQuestion(Label::WarningMsg(), _("The target with this TargetName is already connected. Make sure that multipathing is enabled to prevent data corruption."), _("Continue"), _("Cancel"), `focus_yes)) return nil; } // goto ConnAuthDialog("discovered") (initDiscAuth()) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org