Author: jsmeix Date: Wed Jun 2 16:17:34 2010 New Revision: 62088 URL: http://svn.opensuse.org/viewcvs/yast?rev=62088&view=rev Log: - In Printer.ycp and helps.ycp fixed the text strings therein which still refer to the old button labels before they have been renamed in version 2.19.3 and 2.19.4 (see Novell/Suse Bugzilla bnc#610724). - 2.19.12 (the previous revision was not submitted to openSUSE:Factory) Modified: trunk/printer/package/yast2-printer.changes trunk/printer/src/Printer.ycp trunk/printer/src/helps.ycp Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.changes?rev=62088&r1=62087&r2=62088&view=diff ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Wed Jun 2 16:17:34 2010 @@ -1,6 +1,10 @@ ------------------------------------------------------------------- -Wed May 26 18:57:01 CEST 2010 - jsmeix@suse.de +Wed Jun 2 16:02:09 CEST 2010 - jsmeix@suse.de +- In Printer.ycp and helps.ycp fixed the text strings therein + which still refer to the old button labels before they + have been renamed in version 2.19.3 and 2.19.4 + (see Novell/Suse Bugzilla bnc#610724). - In the driver options dialog replaced the awkward way in the DriverOptionItems function how the currently selected value was shown by a more clean way via plain text addendums which has Modified: trunk/printer/src/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printer.ycp?rev=62088&r1=62087&r2=62088&view=diff ============================================================================== --- trunk/printer/src/Printer.ycp (original) +++ trunk/printer/src/Printer.ycp Wed Jun 2 16:17:34 2010 @@ -1460,9 +1460,9 @@ // Show a fallback text if there are no connections. _("No connections."), // A hint what to do if there are no connections. - // 'More Connections' and 'Connection Wizard' are + // 'Detect More' and 'Connection Wizard' are // button lables and must be translated accordingly: - _("Try 'More Connections' or use the 'Connection Wizard'.") + _("Try 'Detect More' or use the 'Connection Wizard'.") ) ]; } @@ -1567,8 +1567,8 @@ ); if( size( driver_items ) == 0 ) { // If the driver_items list is empty (e.g. because of a too restrictive driver_filter_string), - // show a meaningful text as fallback entry ('More Drivers' is a button label). - driver_string = _("No matching driver found. Change the search string or try 'More Drivers'."); + // show a meaningful text as fallback entry ('Find More' is a button label). + driver_string = _("No matching driver found. Change the search string or try 'Find More'."); driver_items = [ `item( `id( -1 ), driver_string ) ]; // Invalidate selected_ppds_index to be on the safe side. // Otherwise it is possible to set up a queue with a previously selected driver @@ -2090,10 +2090,10 @@ return [ _("No driver options available") ]; } } - // Info for a currently selected item: - string currently_selected_info = _("currently selected"); - // Info for the current setting of the print queue: - string current_setting_info = _("current setting of the print queue"); + // Info for a currently selected item which is to be set as new value in the system: + string currently_selected_info = _("new value"); + // Info for a current setting which is the currently still saved value in the system: + string current_setting_info = _("saved value"); // It seems to be impossible to preselect the currently selected item in a Tree widget. // In particular `item( value, true) does not preselect it. // Therefore an info string is appended to the option value string to mark the currently selected item. @@ -2156,11 +2156,11 @@ // Do not show the leading '*' to the user: value = substring( value, 1 ); current_value_setting = value; - value = value + " (" + current_setting_info + ")"; + value = value + " (" + current_setting_info + ")"; } else { if( currently_selected_value == value ) - { value = value + " (" + currently_selected_info + ")"; + { value = value + " (" + currently_selected_info + ")"; } } value_items_list = add( value_items_list, `item( value ) ); Modified: trunk/printer/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/helps.ycp?rev=62088&r1=62087&r2=62088&view=diff ============================================================================== --- trunk/printer/src/helps.ycp (original) +++ trunk/printer/src/helps.ycp Wed Jun 2 16:17:34 2010 @@ -280,7 +280,7 @@ with the description of the currently used driver when the connection was not changed. This results usually only one single driver which matches so that you would have to enter a less specific driver search string -to get also other drivers or you use the 'More Drivers' button. +to get also other drivers or you use the 'Find More' button. If no driver matches, it does not mean that there is no driver available. Therefore you can enter whatever you like as driver search string and search through all available driver descriptions. -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org