Author: jsrain Date: Wed Aug 8 16:23:51 2007 New Revision: 40099 URL: http://svn.opensuse.org/viewcvs/yast?rev=40099&view=rev Log: added missing help texts changed product name to openSUSE (#297609) Modified: trunk/live-installer/package/yast2-live-installer.changes trunk/live-installer/src/inst_live_simple_proposal.ycp trunk/live-installer/src/inst_live_welcome.ycp trunk/live-installer/src/live-installer.ycp Modified: trunk/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/package/yast2-live-installer.changes?rev=40099&r1=40098&r2=40099&view=diff ============================================================================== --- trunk/live-installer/package/yast2-live-installer.changes (original) +++ trunk/live-installer/package/yast2-live-installer.changes Wed Aug 8 16:23:51 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Aug 8 16:22:14 CEST 2007 - jsrain@suse.cz + +- added missing help texts +- changed product name to openSUSE (#297609) + +------------------------------------------------------------------- Thu Aug 2 10:53:01 CEST 2007 - jsrain@suse.cz - even more simplified installation overview Modified: trunk/live-installer/src/inst_live_simple_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/inst_live_simple_proposal.ycp?rev=40099&r1=40098&r2=40099&view=diff ============================================================================== --- trunk/live-installer/src/inst_live_simple_proposal.ycp (original) +++ trunk/live-installer/src/inst_live_simple_proposal.ycp Wed Aug 8 16:23:51 2007 @@ -11,6 +11,7 @@ import "LiveInstaller"; import "Storage"; import "HTML"; +import "Label"; textdomain "live-installer"; @@ -106,14 +107,29 @@ `VSpacing (1) ); +// help text 1/3 +string help = _("<p> +Use <b>Accept</b> to perform a new installation with the values displayed.</p>") +// help text 2/3 ++ _("<p> +Change the values by clicking on the respective headline +or by using the <b>Change Installation Settings</b> button.</p>") +// help text 3/3 ++ _("<p> +Your hard disk has not been modified in any way, so you can still safely abort. +</p>"); + + + Wizard::SetContents ( _("Installation settings"), contents, - "", + help, GetInstArgs::enable_back(), GetInstArgs::enable_next() ); Wizard::SetTitleIcon ("yast-software"); +Wizard::SetNextButton (`next, Label::AcceptButton ()); symbol ret = nil; Modified: trunk/live-installer/src/inst_live_welcome.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/inst_live_welcome.ycp?rev=40099&r1=40098&r2=40099&view=diff ============================================================================== --- trunk/live-installer/src/inst_live_welcome.ycp (original) +++ trunk/live-installer/src/inst_live_welcome.ycp Wed Aug 8 16:23:51 2007 @@ -10,6 +10,10 @@ textdomain "live-installer"; +// help text 1/1 +string help = _("<p>Welcome to the &product; installation. +Push <b>Next</p> to run the installation wizard.</p>"); + Wizard::SetContents ( // dialog caption, %1 is product name (typically openSUSE) sformat (_("Welcome to %1 installation"), Product::name), @@ -17,7 +21,7 @@ `Label (sformat (_("Your %1 will be installed quickly and easily in a few steps. You will only have to answer some questions."), Product::name)), - "", + help, GetInstArgs::enable_back(), GetInstArgs::enable_next() ); Modified: trunk/live-installer/src/live-installer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/live-installer.ycp?rev=40099&r1=40098&r2=40099&view=diff ============================================================================== --- trunk/live-installer/src/live-installer.ycp (original) +++ trunk/live-installer/src/live-installer.ycp Wed Aug 8 16:23:51 2007 @@ -23,7 +23,7 @@ Installation::scr_destdir = "/mnt"; // FIXME hack because of bootloader - libzypp does not contain product database - Product::name = "SUSE Linux"; + Product::name = "openSUSE"; list<map> stage_mode = [ $["stage": "initial", "mode": "live_installation" ], -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org