Author: jkupec Date: Wed Jun 25 14:27:47 2008 New Revision: 10458 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10458&view=rev Log: - fixed and added new texts Modified: trunk/zypper/src/callbacks/locks.h trunk/zypper/src/locks.cc Modified: trunk/zypper/src/callbacks/locks.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/callbacks/locks.h?rev=10458&r1=10457&r2=10458&view=diff ============================================================================== --- trunk/zypper/src/callbacks/locks.h (original) +++ trunk/zypper/src/callbacks/locks.h Wed Jun 25 14:27:47 2008 @@ -17,15 +17,10 @@ { virtual Action conflict( const PoolQuery& query, ConflictState state ) { - //TODO localize - if (state==SAME_RESULTS) - { - Zypper::instance()->out().error("this query have lock same results as lock which you want remove:"); - } + if (state == SAME_RESULTS) + Zypper::instance()->out().error("The following query locks the same packages as the lock which you want remove:"); else - { - Zypper::instance()->out().error("this query lock some of objects, which you want unlock:"); - } + Zypper::instance()->out().error(_("The following query locks some of the objects you want to unlock:")); query.serialize(std::cout); @@ -38,7 +33,7 @@ { virtual Action execute( const PoolQuery& query ) { - Zypper::instance()->out().error("this query doesn't lock anything:"); + Zypper::instance()->out().error(_("The following query does not lock anything:")); query.serialize(std::cout); @@ -47,10 +42,9 @@ } }; - - } + class LocksCallbacks { private: zypp::LocksSaveReportReceiver _saveReport; Modified: trunk/zypper/src/locks.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/locks.cc?rev=10458&r1=10457&r2=10458&view=diff ============================================================================== --- trunk/zypper/src/locks.cc (original) +++ trunk/zypper/src/locks.cc Wed Jun 25 14:27:47 2008 @@ -118,7 +118,6 @@ Locks::size_type start = 0; try { - Locks & locks = Locks::instance(); locks.read(); start = locks.size(); @@ -155,7 +154,10 @@ zypper.setExitCode(ZYPPER_EXIT_ERR_ZYPP); } if ( start != Locks::instance().size() ) - zypper.out().info(_("Specified lock(-s) has been successfully added.")); + zypper.out().info(_PL( + "Specified lock has been successfully added.", + "Specified locks have been successfully added.", + Locks::instance().size() - start)); } @@ -222,14 +224,15 @@ locks.save(); - if (start==locks.size()) - { + // nothing removed + if (start == locks.size()) zypper.out().info("No lock has been removed."); - // nothing removed - } else { - zypper.out().info(str::form("Lock count has been succesfully decreased by: %lu",start-locks.size())); - //removed something - } + //removed something + else + zypper.out().info(str::form(_PL( + "%lu lock has been successfully removed.", + "%lu locks have been succesfully removed.", + start - locks.size()), start - locks.size())); } catch(const Exception & e) { -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org