From: David Disseldorp Date: Fri, 19 Jul 2013 15:14:51 +0000 (+0200) Subject: Fix grammar in some user facing request strings X-Git-Tag: upstream/1.11.11~171^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1c03b8cba5236e732cc7c17af2455f598254d175;p=platform%2Fupstream%2Fzypper.git Fix grammar in some user facing request strings These strings really hurt my eyes. po-file updates to follow. --- diff --git a/src/RequestFeedback.cc b/src/RequestFeedback.cc index 8f95e17..8fe23a2 100644 --- a/src/RequestFeedback.cc +++ b/src/RequestFeedback.cc @@ -112,7 +112,7 @@ string SolverRequester::Feedback::asUserString( PoolItem highest = asSelectable()(_objsel)->highestAvailableVersionObj(); return str::form( _("There is an update candidate '%s' for '%s', but it does not match" - " specified version, architecture, or repository."), + " the specified version, architecture, or repository."), poolitem_user_string(highest).c_str(), poolitem_user_string(_objinst).c_str()); } @@ -124,7 +124,7 @@ string SolverRequester::Feedback::asUserString( cmdhint << "zypper install " << poolitem_user_string(highest); return str::form( - _("There is an update candidate for '%s', but it is from different" + _("There is an update candidate for '%s', but it is from a different" " vendor. Use '%s' to install this candidate."), _objinst->name().c_str(), cmdhint.str().c_str()); } @@ -137,8 +137,8 @@ string SolverRequester::Feedback::asUserString( << "-" << highest->edition() << "." << highest->arch(); return str::form( - _("There is an update candidate for '%s', but it comes from repository" - " with lower priority. Use '%s' to install this candidate."), + _("There is an update candidate for '%s', but it comes from a repository" + " with a lower priority. Use '%s' to install this candidate."), _objinst->name().c_str(), cmdhint.str().c_str()); }