Author: locilka Date: Fri Apr 11 18:23:14 2008 New Revision: 46448 URL: http://svn.opensuse.org/viewcvs/yast?rev=46448&view=rev Log: - Changing Accept buttons to Install, Update and OK (FATE #120373). The call that UNIFICATION :) Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_network_setup.ycp trunk/installation/src/clients/inst_proposal.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=46448&r1=46447&r2=46448&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Fri Apr 11 18:23:14 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Apr 11 18:21:53 CEST 2008 - locilka@suse.cz + +- Changing Accept buttons to Install, Update and OK (FATE #120373). + +------------------------------------------------------------------- Fri Apr 11 17:55:32 CEST 2008 - locilka@suse.cz - Added another per-image progress into the Installation images Modified: trunk/installation/src/clients/inst_network_setup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_network_setup.ycp?rev=46448&r1=46447&r2=46448&view=diff ============================================================================== --- trunk/installation/src/clients/inst_network_setup.ycp (original) +++ trunk/installation/src/clients/inst_network_setup.ycp Fri Apr 11 18:23:14 2008 @@ -702,7 +702,7 @@ In most cases, if you have a direct connection to the Internet, it doesn't need to be used.</p>"), Label::BackButton(), - Label::AcceptButton() + Label::OKButton() ); if (enable_back_in_netsetup) { Modified: trunk/installation/src/clients/inst_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_proposal.ycp?rev=46448&r1=46447&r2=46448&view=diff ============================================================================== --- trunk/installation/src/clients/inst_proposal.ycp (original) +++ trunk/installation/src/clients/inst_proposal.ycp Fri Apr 11 18:23:14 2008 @@ -981,7 +981,7 @@ // Help text for installation proposal // General part ("You can change values...") is added as the next paragraph. help_text_string = _("<p> -Use <b>Accept</b> to perform a new installation with the values displayed. +Use <b>Install</b> to perform a new installation with the values displayed. </p> ") + how_to_change; @@ -1012,7 +1012,7 @@ // Help text for update proposal // General part ("You can change values...") is added as the next paragraph. help_text_string = _("<p> -Use <b>Accept</b> to perform an update with the values displayed. +Use <b>Update</b> to perform an update with the values displayed. </p> ") + how_to_change; @@ -1152,10 +1152,16 @@ // make_proposal( false, false ); - // Set keyboard focus to the [Accept] or [Next] button + // Set keyboard focus to the [Install] / [Update] or [Next] button Wizard::SetFocusToNextButton(); if (Stage::initial ()) - Wizard::SetNextButton (`next, Label::AcceptButton ()); + Wizard::SetNextButton (`next, ( + // FATE #120373 + Mode::update() ? + _("Update") + : + _("Install") + )); // // Input loop -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org