Author: kmachalkova Date: Thu Apr 17 10:37:47 2008 New Revision: 46775 URL: http://svn.opensuse.org/viewcvs/yast?rev=46775&view=rev Log: Typos, text style, indentation Modified: trunk/network/src/lan/complex.ycp Modified: trunk/network/src/lan/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/complex.ycp?rev=46775&r1=46774&r2=46775&view=diff ============================================================================== --- trunk/network/src/lan/complex.ycp (original) +++ trunk/network/src/lan/complex.ycp Thu Apr 17 10:37:47 2008 @@ -141,8 +141,7 @@ if (!contains(LanItems::Requires, fw)) LanItems::Requires = add(LanItems::Requires, fw); } else { - return (Popup::ContinueCancel(_("The device needs a firmware to function properly. It can be usually downloaded -from your driver vendor web page.\nIf you have already downloaded and installed the firmware, click \'Continue\' + return (Popup::ContinueCancel(_("The device needs a firmware to function properly. It can be usually downloaded from your driver vendor web page.\nIf you have already downloaded and installed the firmware, click \'Continue\' to configure the device. Otherwise click \'Cancel\' and return to this dialog once you have installed the firmware."))); } @@ -156,16 +155,18 @@ if(LanItems::Requires != [] && LanItems::Requires != nil) { if(PackagesInstall(LanItems::Requires) != `next) return false; - if (fw=="b43-fwcutter"){ - if(Popup::ContinueCancelHeadline(_("Installing firmware"), _("For successful firmware installation it needs to execute install_bcm43xx_firmwar script. Should I execute it?"))){ - map command = (map)SCR::Execute(.target.bash_output, "/usr/sbin/install_bcm43xx_firmware"); - y2internal("command %1", command); + if (fw=="b43-fwcutter"){ + if(Popup::ContinueCancelHeadline(_("Installing firmware"), _("For successful firmware installation, 'install_bcm43xx_firmware' script needs to be executed. Execute it now ?"))){ + map command = (map)SCR::Execute(.target.bash_output, "/usr/sbin/install_bcm43xx_firmware"); + //y2internal("command %1", command); // Popup::ShowFile ("Boot Messages", "/tmp/bcm_firmware.log"); // Popup::LongText(command["stdout"]:""); - if (command["exit"]:-1!=0) Popup::ErrorDetails(_("An error occured during installation."), command["stderr"]:""); - else Popup::Message("bcm43xx_firmware installed successfully"); - } - } + if (command["exit"]:-1!=0) + Popup::ErrorDetails(_("An error occurred during firmware installation."), command["stderr"]:""); + else + Popup::Message("bcm43xx_firmware installed successfully"); + } + } } /* TODO: Refresh hwinfo in LanItems -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org