Author: lslezak Date: Wed Aug 3 11:05:32 2011 New Revision: 65162 URL: http://svn.opensuse.org/viewcvs/yast?rev=65162&view=rev Log: - use term "Software manager" instead of "Package manager" (bnc#585679) - 2.21.10 Modified: trunk/yast2/VERSION trunk/yast2/library/packages/src/PackageSystem.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=65162&r1=65161&r2=65162&view=diff ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Wed Aug 3 11:05:32 2011 @@ -1 +1 @@ -2.21.9 +2.21.10 Modified: trunk/yast2/library/packages/src/PackageSystem.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/PackageSystem.ycp?rev=65162&r1=65161&r2=65162&view=diff ============================================================================== --- trunk/yast2/library/packages/src/PackageSystem.ycp (original) +++ trunk/yast2/library/packages/src/PackageSystem.ycp Wed Aug 3 11:05:32 2011 @@ -223,11 +223,11 @@ { message = message + "\n\n" + _("Yast has automatically added or removed some packages, check the changes scheduled to fix the system -in the package manager."); +in the software manager."); } - message = message + "\n\n" + _("Start the package manager and fix the problems + message = message + "\n\n" + _("Start the software manager and fix the problems or skip fixing and install the already confirmed packages only?"); symbol fixsystem = Popup::AnyQuestion3(Label::WarningMsg(), message, Label::ContinueButton(), @@ -291,7 +291,7 @@ // error message, after pressing [OK] the package manager is displayed Report::Error(_("There are unresolved dependencies which need -to be solved manually in the package manager.")); +to be solved manually in the software manager.")); // disable repomanagement during installation boolean repomgmt = !Mode::installation(); Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=65162&r1=65161&r2=65162&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Wed Aug 3 11:05:32 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Aug 3 09:04:32 UTC 2011 - lslezak@suse.cz + +- use term "Software manager" instead of "Package manager" + (bnc#585679) +- 2.21.10 + +------------------------------------------------------------------- Tue Aug 2 09:19:26 CEST 2011 - locilka@suse.cz - Fixed Get/SetBroadcastAllowedPorts in SuSEFirewall to keep -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org