[yast-commit] r46590 - in /trunk/installation: package/yast2-installation.changes src/clients/inst_doit.ycp src/clients/inst_software_selection.ycp

Author: locilka Date: Mon Apr 14 16:18:19 2008 New Revision: 46590 URL: http://svn.opensuse.org/viewcvs/yast?rev=46590&view=rev Log: - Some better texts (bnc #377959). - Better text for Software Selection dialog (bnc #379157). Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_doit.ycp trunk/installation/src/clients/inst_software_selection.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=46590&r1=46589&r2=46590&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Apr 14 16:18:19 2008 @@ -6,6 +6,7 @@ (fate #302980). - Caching system files in the System Analysis dialog. - Some better texts (bnc #377959). +- Better text for Software Selection dialog (bnc #379157). - 2.13.34 ------------------------------------------------------------------- Modified: trunk/installation/src/clients/inst_doit.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_doit.ycp?rev=46590&r1=46589&r2=46590&view=diff ============================================================================== --- trunk/installation/src/clients/inst_doit.ycp (original) +++ trunk/installation/src/clients/inst_doit.ycp Mon Apr 14 16:18:19 2008 @@ -41,7 +41,7 @@ `VBox ( // TRANSLATORS: starting the installation process `Label (_("Fasten your seatbelts, please, -we're taking off in a few seconds...")) +we are taking off in a few seconds...")) ), // TRANSLATORS: dialog help _("<p>Installation is just about to start!</p>"), Modified: trunk/installation/src/clients/inst_software_selection.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_software_selection.ycp?rev=46590&r1=46589&r2=46590&view=diff ============================================================================== --- trunk/installation/src/clients/inst_software_selection.ycp (original) +++ trunk/installation/src/clients/inst_software_selection.ycp Mon Apr 14 16:18:19 2008 @@ -33,13 +33,19 @@ DefaultDesktop::Init(); } -// TRANSLATORS: help text 1/2 -string help = _("<p>This is a base selection where you can decide which common -parts of the system will by installed.</p>") + - -// TRANSLATORS: help text 2/2 -_("<p>Select a <b>System Type</b> that allows you to choose -the base task of the system.</p>"); +// TRANSLATORS: help text, part 1 +string help = _("<p>At Linux <b>choice</b> is a top priority. <i>openSUSE</i> offers a number +of different desktop environments. Below you see a list of the 2 major ones +<b>GNOME</b> and <b>KDE</b>. Both provide an easy to use desktop with a large number +of desktop applications such as email, file browser, games and many others.</p>") + + +// TRANSLATORS: help text, part 2 +_("<p>As desktop selection is a matter of taste a clear <i>recommendation can't be +given</i>.</p>") + + +// TRANSLATORS: help text, part 3 +_("Additionally, not only desktop but you can also chose a minimalistic +installation that could fit your needs better."); map all_desktops = DefaultDesktop::GetAllDesktopsMap(); @@ -75,11 +81,19 @@ term ret = `VBox (); integer counter = -1; + integer last_desktop_order = -1; foreach (string desktop_name, sort_order, { counter = counter + 1; + integer desktop_order = all_desktops[desktop_name,"order"]:99; - // boolean text_mode + y2milestone ("L: %1, C: %2", last_desktop_order, desktop_order); + // bnc #379157 + // some space between 'Base' and 'Other' desktops + if (last_desktop_order == 1 && desktop_order > 1) { + ret[counter] = `VSpacing (1); + counter = counter + 1; + } ret[counter] = `Left (`HBox ( @@ -91,24 +105,31 @@ all_desktops[desktop_name,"label"]:"" ) )); + + last_desktop_order = desktop_order; }); return ret; } void RedrawSelDesktopInfo (string currently_selected) { + string description = ""; + if (currently_selected == nil || currently_selected == "") { y2milestone ("No desktop is currently selected"); - return; + + // TRANSLATORS: dialog hint + description = _("Select a system to get its description."); } else { y2milestone ("Selected desktop: %1", currently_selected); - } - list <string> desktop_patterns = all_desktops[currently_selected,"patterns"]:[]; - list