Author: jdsn Date: Tue Apr 22 18:15:10 2008 New Revision: 46968 URL: http://svn.opensuse.org/viewcvs/yast?rev=46968&view=rev Log: added strings for Xgl settings and abbreviation of millions Modified: trunk/x11/package/yast2-x11.changes trunk/x11/src/XMessages.ycp trunk/x11/src/autoyast/dialog/autoDialog.ycp trunk/x11/src/proposal/x11_proposal.ycp Modified: trunk/x11/package/yast2-x11.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/package/yast2-x11.changes?rev=46968&r1=46967&r2=46968&view=diff ============================================================================== --- trunk/x11/package/yast2-x11.changes (original) +++ trunk/x11/package/yast2-x11.changes Tue Apr 22 18:15:10 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 22 18:13:29 CEST 2008 - jdsn@suse.de + +- added new strings for Xgl settings and abbr. of million + +------------------------------------------------------------------- Mon Mar 17 12:43:32 CET 2008 - jsrain@suse.cz - added 'StartupNotify=true' to the desktop file (bnc #304964) Modified: trunk/x11/src/XMessages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/XMessages.ycp?rev=46968&r1=46967&r2=46968&view=diff ============================================================================== --- trunk/x11/src/XMessages.ycp (original) +++ trunk/x11/src/XMessages.ycp Tue Apr 22 18:15:10 2008 @@ -45,30 +45,70 @@ X11 configuration module. "); -//============================================= -// 256 colors -//--------------------------------------------- -global string colors256 = _("256 Colors"); +// 256 colors - lower case +string colors256_lc = _("256 colors"); +// 256 Colors - upper case +string colors256_uc = _("256 Colors"); + +// 32768 colors - lower case +string colors32k_lc = _("32768 colors"); +// 32768 colors - upper case +string colors32k_uc = _("32768 Colors"); + +// 65536 colors - lower case +string colors65k_lc = _("65536 colors"); +// 65536 colors - upper case +string colors65k_uc = _("65536 Colors"); + +// 16.7 m colors - lower case +string colors16m_lc = _("16.7 m colors"); +// 16.7 M colors - upper case +string colors16m_uc = _("16.7 M Colors"); +// 16.7 Mio. colors - business language +string colors16m_uc_business = _("16.7 Mio. Colors"); + +global string colors256 = colors256_lc; +global string colors32k = colors32k_lc; +global string colors65k = colors65k_lc; +global string colors16m = colors16m_lc; -//============================================= -// 32768 colors -//--------------------------------------------- -global string colors32k = _("32768 Colors"); //============================================= -// 65536 colors -//--------------------------------------------- -global string colors65k = _("65536 Colors"); +// Colors - title for a drop-down box +global string colors = _("Colors"); -//============================================= -// 16.7 Mio. colors -//--------------------------------------------- -global string colors16m = _("16.7 Mio. Colors"); +// string for a drop-down box +global string color8bit = _("256 [ 8 bit ]"); +// string for a drop-down box +global string color15bit = _("32768 [ 15 bit ]"); +// string for a drop-down box +global string color16bit = _("65536 [ 16 bit ]"); +// string for a drop-down box - lower case +string color24bit_lc = _("16.7 m [ 24 bit ]"); +// string for a drop-down box - upper case +string color24bit_uc = _("16.7 M [ 24 bit ]"); +// string for a drop-down box - business language +string color24bit_uc_business = _("16.7 Mio. [ 24 bit ]"); +global string color24bit = color24bit_lc; + +//============================================= +// Xgl strings +//--------------------------------------------- +// label for a checkbox +global string enableXgl = _("Enable Xgl"); +// label for a checkbox +global string enableXglIfPossible = _("Enable Xgl if possible"); +// label for a text entry +global string xglOptions = _("Xgl options"); +// label for a heading +global string xglOptions = _("Xgl Options"); +// label for a text entry +global string customXglOptions = _("Custom Xgl options"); +// label for a heading +global string customXglOptions = _("Custom Xgl Options"); +// label for a drop-down box +global string XServer = _("X server"); -//============================================= -// color key -//--------------------------------------------- -global string colors = _("Colors"); //============================================= // graphics card Modified: trunk/x11/src/autoyast/dialog/autoDialog.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/autoyast/dialog/autoDialog.ycp?rev=46968&r1=46967&r2=46968&view=diff ============================================================================== --- trunk/x11/src/autoyast/dialog/autoDialog.ycp (original) +++ trunk/x11/src/autoyast/dialog/autoDialog.ycp Tue Apr 22 18:15:10 2008 @@ -109,7 +109,21 @@ `id(`enable_3d), _("&Enable 3D Support if possible"), x11["enable_3d"]:false) + ), + `Left( + `CheckBox( + `id(`enable_xgl), + _("Enable &Xgl if possible"), + x11["enable_xgl"]:false) ), + `Left( + `HBox( `CheckBox( + `id(`xgl_options), + _("&Custom Xgl options"), + x11["xgl_options"]:false), + `TextEntry(`id(`xgl_options_string), ""), + `PushButton(`id(`fetch_xgl_options), _("Fetch from system")) + )), `VSpacing(1), `HBox( `HWeight(50, Modified: trunk/x11/src/proposal/x11_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/proposal/x11_proposal.ycp?rev=46968&r1=46967&r2=46968&view=diff ============================================================================== --- trunk/x11/src/proposal/x11_proposal.ycp (original) +++ trunk/x11/src/proposal/x11_proposal.ycp Tue Apr 22 18:15:10 2008 @@ -261,15 +261,15 @@ if (chosenID == "sax-resolution") { y2milestone("X11: setup resolution..."); string depth = XLib::getActiveColorDepth(); - string colstr = "256 [ 8 bit ]"; + string colstr = XMessages::color8bit; if (depth == "15") { - colstr = "32768 [ 15 bit ]"; + colstr = XMessages::color15bit; } if (depth == "16") { - colstr = "65536 [ 16 bit ]"; + colstr = XMessages::color16bit; } if (depth == "24") { - colstr = "16.7 Mio. [ 24 bit ]"; + colstr = XMessages::color24bit; } string selectedRes = setupResolutions ( XLib::getAvailableResolutionNames(), @@ -292,15 +292,15 @@ if (chosenID == "sax-colors") { y2milestone("X11: setup color depth..."); string depth = XLib::getActiveColorDepth(); - string colstr = "256 [ 8 bit ]"; + string colstr = XMessages::color8bit; if (depth == "15") { - colstr = "32768 [ 15 bit ]"; + colstr = XMessages::color15bit; } if (depth == "16") { - colstr = "65536 [ 16 bit ]"; + colstr = XMessages::color16bit; } if (depth == "24") { - colstr = "16.7 Mio. [ 24 bit ]"; + colstr = XMessages::color24bit; } string selectedColor = setupColors ( XLib::getActiveResolutionString(), -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org