Author: jsuchome Date: Thu Mar 29 15:15:57 2012 New Revision: 67777 URL: http://svn.opensuse.org/viewcvs/yast?rev=67777&view=rev Log: - merged proofed texts Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes trunk/iscsi-client/src/IscsiClient.ycp trunk/iscsi-client/src/IscsiClientLib.ycp trunk/iscsi-client/src/helps.ycp 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=67777&r1=67776&r2=67777&view=diff ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Thu Mar 29 15:15:57 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 15:15:41 CEST 2012 - jsuchome@suse.cz + +- merged proofed texts + +------------------------------------------------------------------- Wed Feb 15 11:36:05 CET 2012 - fehr@suse.de - version 2.22.0 Modified: trunk/iscsi-client/src/IscsiClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClient.ycp?rev=67777&r1=67776&r2=67777&view=diff ============================================================================== --- trunk/iscsi-client/src/IscsiClient.ycp (original) +++ trunk/iscsi-client/src/IscsiClient.ycp Thu Mar 29 15:15:57 2012 @@ -229,7 +229,7 @@ list<string> descr = [ /* Progress stage 1/2 */ - _("Write the autoYaST settings"), + _("Write AutoYaST settings"), /* Progress stage 2/2 */ _("Set up service status") ]; Modified: trunk/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.ycp?rev=67777&r1=67776&r2=67777&view=diff ============================================================================== --- trunk/iscsi-client/src/IscsiClientLib.ycp (original) +++ trunk/iscsi-client/src/IscsiClientLib.ycp Thu Mar 29 15:15:57 2012 @@ -383,9 +383,11 @@ y2milestone("checkInitiatorName initiatorname=%1", initiatorname); if (size(name_from_bios)>0 && name_from_bios!=initiatorname) { - 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.") ); + Popup::Warning( _("InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt> +differ. The old initiator name will be replaced by the value of iBFT and a +backup created. If you want to use a different initiator name, 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=67777&r1=67776&r2=67777&view=diff ============================================================================== --- trunk/iscsi-client/src/helps.ycp (original) +++ trunk/iscsi-client/src/helps.ycp Thu Mar 29 15:15:57 2012 @@ -103,11 +103,13 @@ // authentification dialog for add/discovery target "conn_auth" : _("<h1>iSCSI Initiator</h1>") +_("Select the type of authentication and enter the <b>Username</b> and <b>Password</b>.") + - _("<h1>Startup</h1>") + _("<p><b>manual</b> is for iSCSI targets to not be connected by default, user needs to do it manually</p> -<p><b>onboot</b> is for iSCSI targets to be connected during boot, ie when root is on -iSCSI. As such it will be evaluated from the initrd.</p> -<p><b>automatic</b> is for iSCSI targets to be connected when the iSCSI service itself -starts up.</p>"), + _("<h1>Startup</h1>") + _("<p><b>manual</b> is for iSCSI targets which are not to be connected by +default, the user needs to connect them manually</p> +<p><b>onboot</b> is for iSCSI targets to be connected during boot, i.e. when +root is on iSCSI. As such it will be evaluated by the initrd.</p> +<p><b>automatic</b> is for iSCSI targets to be connected when the iSCSI service +starts up.</p> +"), // list of discovered targets "discovered" : _("List of discovered targets. Start a new <b>Discovery</b> or <b>Connect</b> to any target."), -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org