[yast-commit] r64653 - in /trunk/installation: VERSION package/yast2-installation.changes src/clients/inst_automatic_configuration.ycp src/inst_finish/save_config_finish.ycp src/modules/ImageInstallation.ycp
Author: jsuchome Date: Thu Jun 30 14:13:47 2011 New Revision: 64653 URL: http://svn.opensuse.org/viewcvs/yast?rev=64653&view=rev Log: - fixed typos (bnc#703119) - 2.21.6 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_automatic_configuration.ycp trunk/installation/src/inst_finish/save_config_finish.ycp trunk/installation/src/modules/ImageInstallation.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=64653&r1=64652&r2=64653&view=diff ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Thu Jun 30 14:13:47 2011 @@ -1 +1 @@ -2.21.5 +2.21.6 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=64653&r1=64652&r2=64653&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Jun 30 14:13:47 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jun 30 14:09:17 CEST 2011 - jsuchome@suse.cz + +- fixed typos (bnc#703119) +- 2.21.6 + +------------------------------------------------------------------- Wed Jun 1 17:24:25 CEST 2011 - locilka@suse.cz - always loading 'pciehp' kernel module on Dell hardware Modified: trunk/installation/src/clients/inst_automatic_configuration.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_automatic_configuration.ycp?rev=64653&r1=64652&r2=64653&view=diff ============================================================================== --- trunk/installation/src/clients/inst_automatic_configuration.ycp (original) +++ trunk/installation/src/clients/inst_automatic_configuration.ycp Thu Jun 30 14:13:47 2011 @@ -223,7 +223,7 @@ Wizard::OpenNextBackStepsDialog(); DumpACUIError(); InstError::ShowErrorPopupWithLogs ( - sformat (_("An error has occured while calling '%1' AC script."), last_client) + sformat (_("An error has occurred while calling '%1' AC script."), last_client) ); } @@ -235,7 +235,7 @@ DumpACUIError(); y2error ("There is no Automatic Configuration dialog, adjusting the current one..."); InstError::ShowErrorPopupWithLogs ( - sformat (_("An error has occured while calling '%1' AC script."), last_client) + sformat (_("An error has occurred while calling '%1' AC script."), last_client) ); } Modified: trunk/installation/src/inst_finish/save_config_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/inst_finish/save_config_finish.ycp?rev=64653&r1=64652&r2=64653&view=diff ============================================================================== --- trunk/installation/src/inst_finish/save_config_finish.ycp (original) +++ trunk/installation/src/inst_finish/save_config_finish.ycp Thu Jun 30 14:13:47 2011 @@ -131,7 +131,7 @@ { Progress::NextStep (); // progress step title - Progress::Title (_("Saving automatical installation settings...")); + Progress::Title (_("Saving automatic installation settings...")); AutoInstall::Save(); } Progress::NextStep (); Modified: trunk/installation/src/modules/ImageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/ImageInstallation.ycp?rev=64653&r1=64652&r2=64653&view=diff ============================================================================== --- trunk/installation/src/modules/ImageInstallation.ycp (original) +++ trunk/installation/src/modules/ImageInstallation.ycp Thu Jun 30 14:13:47 2011 @@ -1233,14 +1233,14 @@ } // Error message - Report::Error (_("Installation was unable to solve package dependecies automatically. + Report::Error (_("Installation was unable to solve package dependencies automatically. Package manager will be opened for you to solve them manually.")); boolean ret = false; // BNC #Trying to solve deps. manually while (true) { - y2warning ("Cannot solve dependecies automatically, opening Packages UI"); + y2warning ("Cannot solve dependencies automatically, opening Packages UI"); symbol diaret = PackagesUI::RunPackageSelector ($["enable_repo_mgr":false, "mode":`summaryMode]); y2milestone ("RunPackageSelector returned %1", diaret); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
jsuchome@svn2.opensuse.org