Author: jsuchome Date: Wed Nov 16 12:27:45 2011 New Revision: 66822 URL: http://svn.opensuse.org/viewcvs/yast?rev=66822&view=rev Log: - merged texts from proofreading - 2.22.0 Modified: trunk/fcoe-client/VERSION trunk/fcoe-client/package/yast2-fcoe-client.changes trunk/fcoe-client/src/FcoeClient.ycp trunk/fcoe-client/src/complex.ycp trunk/fcoe-client/src/helps.ycp Modified: trunk/fcoe-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/VERSION?rev=66822&r1=66821&r2=66822&view=diff ============================================================================== --- trunk/fcoe-client/VERSION (original) +++ trunk/fcoe-client/VERSION Wed Nov 16 12:27:45 2011 @@ -1 +1 @@ -2.21.12 +2.22.0 Modified: trunk/fcoe-client/package/yast2-fcoe-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/package/yast2-fcoe-client.changes?rev=66822&r1=66821&r2=66822&view=diff ============================================================================== --- trunk/fcoe-client/package/yast2-fcoe-client.changes (original) +++ trunk/fcoe-client/package/yast2-fcoe-client.changes Wed Nov 16 12:27:45 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 16 12:26:34 CET 2011 - jsuchome@suse.cz + +- merged texts from proofreading +- 2.22.0 + +------------------------------------------------------------------- Thu Oct 27 13:41:55 CEST 2011 - gs@suse.de - Don't enable service start at boot during installation (is Modified: trunk/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/FcoeClient.ycp?rev=66822&r1=66821&r2=66822&view=diff ============================================================================== --- trunk/fcoe-client/src/FcoeClient.ycp (original) +++ trunk/fcoe-client/src/FcoeClient.ycp Wed Nov 16 12:27:45 2011 @@ -894,7 +894,7 @@ /* Progress stage 3/3 */ _("Detect network cards"), /* Progress stage 4/4 */ - _("Read /etc/fcoe/config" ) + _("Read /etc/fcoe/config") ], [ /* Progress step 1/3 */ _("Checking for installed packages..."), @@ -903,7 +903,7 @@ /* Progress step 3/3 */ _("Detecting network cards..."), /* Progress step 4/4 */ - _("Reading /etc/fcoe/config" ), + _("Reading /etc/fcoe/config"), /* Progress finished */ _("Finished") ], @@ -1020,7 +1020,8 @@ success = WriteCfgFiles(); if( !success ) Report::Error (_("Cannot write settings for FCoE interfaces. -For details see /var/log/YaST2/y2log") ); +For details, see /var/log/YaST2/y2log. +") ); if(PollAbort()) return false; Progress::NextStage(); Modified: trunk/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/complex.ycp?rev=66822&r1=66821&r2=66822&view=diff ============================================================================== --- trunk/fcoe-client/src/complex.ycp (original) +++ trunk/fcoe-client/src/complex.ycp Wed Nov 16 12:27:45 2011 @@ -287,7 +287,7 @@ string ifcfg_file = sformat( "/etc/sysconfig/network/ifcfg-%1\.%2", dev_name, card["vlan_interface"]:"" ); // headline of a popup: creating and starting Fibre Channel over Ethernet - boolean ret = Popup::YesNoHeadline( _("Creating and starting FCoE on detected VLAN device"), + boolean ret = Popup::YesNoHeadline( _("Creating and Starting FCoE on Detected VLAN Device"), // question to the user: really create and start FCoE sformat( _("Do you really want to create a FCoE network interface for discovered FCoE VLAN interface @@ -305,7 +305,7 @@ if ( output["exit"]:255 != 0 ) { // text of an error popup - Popup::Error( sformat( _("Cannot create and start FCoE on %1"), dev_name ) ); + Popup::Error( sformat( _("Cannot create and start FCoE on %1."), dev_name ) ); return nil; } } @@ -395,11 +395,11 @@ if ( !Stage::initial() ) { // popup text continues - popup_text = popup_text + "\n" + _( "Please note: The device won't be restored on 'Cancel'." ); + popup_text = popup_text + "\n" + _("Please note: The device won't be restored on 'Cancel'."); } // headline of a popup - boolean ret = Popup::YesNoHeadline( _("Removing FCoE VLAN device"), + boolean ret = Popup::YesNoHeadline( _("Removing FCoE VLAN Device"), popup_text ); if ( ret == true ) @@ -450,7 +450,7 @@ } else { - Popup::Error( sformat( _("Removing of interface %1 failed"), card["fcoe_vlan"]:"") ); + Popup::Error( sformat( _("Removing of interface %1 failed."), card["fcoe_vlan"]:"") ); y2error( "Removing of interface %1 failed", card["fcoe_vlan"]:"" ); } } @@ -483,7 +483,8 @@ { // text of a warning popup Popup::Warning( _("DCB Required is set to \"yes\" but the -interface isn't DCB capable") ); +interface isn't DCB capable. +") ); y2warning( "DCB_REQUIRED is set to yes but the interface isn't DCB capable" ); } } Modified: trunk/fcoe-client/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/helps.ycp?rev=66822&r1=66821&r2=66822&view=diff ============================================================================== --- trunk/fcoe-client/src/helps.ycp (original) +++ trunk/fcoe-client/src/helps.ycp Wed Nov 16 12:27:45 2011 @@ -64,7 +64,7 @@ /* Summary dialog help 2/3 */ _("<p><b><big>Adding a fcoe-client:</big></b><br> -Choose an fcoe-client from the list of detected fcoe-clients. +Choose a fcoe-client from the list of detected fcoe-clients. If your fcoe-client was not detected, use <b>Other (not detected)</b>. Then press <b>Configure</b>.</p> ") + @@ -77,37 +77,37 @@ /* Services dialog help 1/3 */ "services" : _("<p><b><big>Starting of services</big><br></b><br> -There is the possibility to enable or disable the start of the services -<b>fcoe</b> and <b>lldpad</b> at boot time.</p> +Enable or disable the start of the services <b>fcoe</b> and <b>lldpad</b> at boot time.</p> ") + /* Services dialog help 2/3 */ _("<p>Starting the service <b>fcoe</b> means starting the <i>Fibre Channel over Ethernet</i> service daemon <i>fcoemon</i> which controls the FCoE interfaces and -establishes a connection with the daemon <i>lldpad</i>.</p>" ) + +establishes a connection with the daemon <i>lldpad</i>.</p>") + /* Services dialog help 3/3 */ - _("<p>The <b>lldpad</b> service provides the <i>Link Layer Discovery Protocol</i> agent daemon <i>lldpad</i> which informs <i>fcoemon</i> about DCB (Data Center Bridging) features and configuration of the interfaces.</p>"), + _("<p>The <b>lldpad</b> service provides the <i>Link Layer Discovery Protocol</i> agent daemon <i>lldpad</i>, which informs <i>fcoemon</i> about DCB (Data Center Bridging) features and configuration of the interfaces.</p>"), /* Interfaces dialog help 1/4 */ "interfaces" : _("<p><b><big>Network interface overview</big></b></p>") + /* Interfaces dialog help 2/4 */ -_("<p>The interfaces dialog shows all detected netcards including the status of VLAN and FCoE configuration.<br>FCoE is possible if a VLAN interface is configured for FCoE on the switch. For every netcard (network interface) this is shown in column <i>FCoE VLAN Interface</i>.</p>") + +_("<p>The interfaces dialog shows all detected netcards including the status of VLAN and FCoE configuration.<br>FCoE is possible if a VLAN interface is configured for FCoE on the switch. For every netcard (network interface), this is shown in column <i>FCoE VLAN Interface</i>.</p>") + /* Interfaces dialog help 3/4 */ _("<p>The values for <i>FCoE VLAN Interface</i> in detail:<br> -<b>not available</b>: Fibre Channel over Ethernet isn't possible (must be enabled on the switch first)<br> -<b>not configured</b>: FCoE is possible but not yet activated, press <b>Create FCoE VLAN Interface</b> to do this.<br> - If the FCoE VLAN interface is already created the name is shown in the column, e.g. eth3.200.</p>") + +<b>not available</b>: Fibre Channel over Ethernet is not possible (must be enabled on the switch first).<br> +<b>not configured</b>: FCoE is possible but not yet activated. Press <b>Create FCoE VLAN Interface</b> to activate.<br> + If the FCoE VLAN interface has already been created, the name is shown in the column, e.g. eth3.200.</p> +") + /* Interfaces dialog help 3/4 */ - _("<p>To change the configuration of an existing FCoE VLAN interface press button <b>Change Settings</b>.</p>" ), + _("<p>To change the configuration of an existing FCoE VLAN interface, click on<b>Change Settings</b>.</p>"), /* Configuration dialog help 1/3 */ - "configuration" : _("<p><b><big>General configuration of FCoE</big></b></p>") + + "configuration" : _("<p><b><big>General Configuration of FCoE</big></b></p>") + /* Configuration dialog help 2/3 */ - _("<p>Here you can configure the general settings for the FCoE system service. The settings are written to '/etc/fcoe/config'.</p>") + + _("<p>Configure the general settings for the FCoE system service. The settings are written to '/etc/fcoe/config'.</p>") + /* Configuration dialog help 3/3 */ _("<p>The values are:<br> @@ -117,21 +117,21 @@ Messages are sent to the system log if set to <i>yes</i> (data are logged to /var/log/messages).</p>"), /* edit dialog help 1/3 */ - "change" : _("<p>Edit settings in /etc/fcoe/ethx</p>" ) + + "change" : _("<p>Edit Settings in /etc/fcoe/ethx</p>") + /* Edit dialog help 2/3 */ - _( "<p>The daemon <i>fcoemon</i> reads these configuration files on initialization. + _("<p>The daemon <i>fcoemon</i> reads these configuration files on initialization. There is a file for every interface and the values indicate whether FCoE instances - should be created and if DCB is required.</p>" ) + + should be created and if DCB is required.</p>") + /* Edit dialog help 3/3 */ - _( "<p>The values are:<br> + _("<p>The values are:<br> <b>FCoE Enable</b>: <i>yes</i> or <i>no</i><br> Enable or disable the creation of FCoE instances.<br> <b>DCB Required</b>: <i>yes</i> or <i>no</i><br> The default is <i>yes</i>, DCB is usually required.<br> <b>AUTO VLAN</b>: <i>yes</i> or <i>no</i><br> If set to <i>yes</i> 'fcoemon' will create the VLAN -interfaces automatically.</p>" ), +interfaces automatically.</p>"), ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org