Author: mvidner Date: Fri Jan 13 16:05:54 2012 New Revision: 67200 URL: http://svn.opensuse.org/viewcvs/yast?rev=67200&view=rev Log: Fixed the bonding label again following info from mt (bnc#737333#c18). svn merge -c67199 http://svn.opensuse.org/svn/yast/branches/SuSE-Code-11-SP2-Branch/network Modified: trunk/network/ (props changed) trunk/network/package/yast2-network.changes trunk/network/src/lan/address.ycp Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=67200&r1=67199&r2=67200&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Fri Jan 13 16:05:54 2012 @@ -3,7 +3,7 @@ - AY keep_install_network: merge dns and routing from linuxrc item by item, not just in bulk (bnc#712864). -- Clarified the label for BOOTPROTO=none: "No Setup (Bridge or +- Clarified the label for BOOTPROTO=none: "No Link and IP Setup ( Bonding Slaves)" (bnc#737333). - 2.22.1 Modified: trunk/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=67200&r1=67199&r2=67200&view=diff ============================================================================== --- trunk/network/src/lan/address.ycp (original) +++ trunk/network/src/lan/address.ycp Fri Jan 13 16:05:54 2012 @@ -323,7 +323,7 @@ else */ if (LanItems::type!="eth") UI::ReplaceWidget(`rp, `Left( - `RadioButton(`id(`none),`opt(`notify), _("No Setup (Bridge or Bonding Slaves)")))); + `RadioButton(`id(`none),`opt(`notify), _("No Link and IP Setup (Bonding Slaves)")))); switch(settings["BOOTPROTO"]:""){ case "static": UI::ChangeWidget(`id(`bootproto), `CurrentButton, `static); UI::ChangeWidget(`id(`ipaddr), `Value, settings["IPADDR"]:""); @@ -781,7 +781,7 @@ `ReplacePoint(`id(`rp), `Left( `HBox( - `RadioButton(`id(`none),`opt(`notify), _("No Setup (Bridge or Bonding Slaves)")), + `RadioButton(`id(`none),`opt(`notify), _("No Link and IP Setup (Bonding Slaves)")), `HSpacing(1), `CheckBox(`id(`ibft), `opt(`notify), _("Use iBFT values")) ) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org