Author: jsuchome Date: Tue Jan 6 14:28:49 2009 New Revision: 54400 URL: http://svn.opensuse.org/viewcvs/yast?rev=54400&view=rev Log: - used String::RemoveShortcut where button labels are in the help texts (bnc#307220) - 2.18.1 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/widgets.ycp trunk/users/yast2-users.spec.in Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=54400&r1=54399&r2=54400&view=diff ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Tue Jan 6 14:28:49 2009 @@ -1 +1 @@ -2.18.0 +2.18.1 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.changes?rev=54400&r1=54399&r2=54400&view=diff ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Tue Jan 6 14:28:49 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jan 6 14:27:21 CET 2009 - jsuchome@suse.cz + +- used String::RemoveShortcut where button labels are in the help + texts (bnc#307220) +- 2.18.1 + +------------------------------------------------------------------- Tue Dec 16 19:44:10 CET 2008 - jsuchome@suse.cz - do not try to detect network authentication methods during Modified: trunk/users/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/widgets.ycp?rev=54400&r1=54399&r2=54400&view=diff ============================================================================== --- trunk/users/src/widgets.ycp (original) +++ trunk/users/src/widgets.ycp Tue Jan 6 14:28:49 2009 @@ -19,6 +19,7 @@ import "Progress"; import "Report"; import "Stage"; +import "String"; import "Summary"; import "Users"; import "UsersCache"; @@ -1060,10 +1061,8 @@ */ define string help_main_end()``{ - // button label (without shortcut sign) - string button = Stage::cont () ? _("Next") : - // button label (without shortcut sign) - _("Finish"); + string button = Stage::cont () ? Label::NextButton_() : + Label::FinishButton_(); // help text 1/3 return _("<p> @@ -1084,7 +1083,7 @@ To save the modified user and group settings to your system, press <b>%1</b>. </p> -"), button); +"), String::RemoveShortcut (button)); } /** Modified: trunk/users/yast2-users.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/yast2-users.spec.in?rev=54400&r1=54399&r2=54400&view=diff ============================================================================== --- trunk/users/yast2-users.spec.in (original) +++ trunk/users/yast2-users.spec.in Tue Jan 6 14:28:49 2009 @@ -10,8 +10,8 @@ # this forces using yast2-ldap with orrect LDAP object names (fate#303596) Requires: yast2-ldap-client >= 2.17.1 -# InstExtensionImage::LoadExtension -Requires: yast2 >= 2.17.17 +# String::RemoveShortcut +Requires: yast2 >= 2.18.0 Summary: Configuration of users and groups -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org