From 1bd12618e76f2fe8ec913781a619a123ef5d54da Mon Sep 17 00:00:00 2001 From: Stefan Haas Date: Tue, 14 Aug 2007 13:20:17 +0000 Subject: [PATCH] changed messages regarding to the new pot-file --- zypp/solver/detail/ProblemSolutionAllBranches.cc | 2 +- zypp/solver/detail/ProblemSolutionIgnore.cc | 4 ++-- zypp/solver/detail/ProblemSolutionUninstall.cc | 2 +- zypp/solver/detail/ResolverInfoMisc.cc | 18 +++++++-------- zypp/solver/detail/ResolverInfoMissingReq.cc | 2 +- zypp/solver/detail/Resolver_problems.cc | 28 ++++++++++++------------ zypp/target/rpm/RpmDb.cc | 4 ++-- 7 files changed, 30 insertions(+), 30 deletions(-) diff --git a/zypp/solver/detail/ProblemSolutionAllBranches.cc b/zypp/solver/detail/ProblemSolutionAllBranches.cc index ff79f80..33ceefe 100644 --- a/zypp/solver/detail/ProblemSolutionAllBranches.cc +++ b/zypp/solver/detail/ProblemSolutionAllBranches.cc @@ -48,7 +48,7 @@ ProblemSolutionAllBranches::ProblemSolutionAllBranches( ResolverProblem_Ptr pare : ProblemSolution (parent, "", "") { _description = _("Make a solver run with ALL possibilities."); - _details = _("Regarding all resolvables with compatible architecture."); + _details = _("Regarding all resolvables with a compatible architecture."); addAction ( new TransactionSolutionAction (ALLBRANCHES)); } diff --git a/zypp/solver/detail/ProblemSolutionIgnore.cc b/zypp/solver/detail/ProblemSolutionIgnore.cc index a9c444d..1c5984e 100644 --- a/zypp/solver/detail/ProblemSolutionIgnore.cc +++ b/zypp/solver/detail/ProblemSolutionIgnore.cc @@ -60,7 +60,7 @@ ProblemSolutionIgnoreRequires::ProblemSolutionIgnoreRequires( ResolverProblem_Pt const Capability & capability) : ProblemSolution (parent, "", "") { - _description = _("Ignore this requirement generally"); + _description = _("Generally ignore this requirement"); for (PoolItemList::const_iterator iter = itemList.begin(); iter != itemList.end(); iter++) { addAction ( new InjectSolutionAction (*iter, capability, REQUIRES)); @@ -75,7 +75,7 @@ ProblemSolutionIgnoreArchitecture::ProblemSolutionIgnoreArchitecture( ResolverPr _description = str::form(_("Install %s although it would change the architecture"), item->name().c_str()); // TranslatorExplanation %s = name of package, patch, selection ... - _details = str::form(_("%s provides this dependency but would changed the architecture of the installed item"), + _details = str::form(_("%s provides this dependency, but would change the architecture of the installed item"), ResolverInfo::toString (item).c_str()); addAction ( new InjectSolutionAction (item, ARCHITECTURE)); } diff --git a/zypp/solver/detail/ProblemSolutionUninstall.cc b/zypp/solver/detail/ProblemSolutionUninstall.cc index 13baa41..689af86 100644 --- a/zypp/solver/detail/ProblemSolutionUninstall.cc +++ b/zypp/solver/detail/ProblemSolutionUninstall.cc @@ -78,7 +78,7 @@ ProblemSolutionUninstall::ProblemSolutionUninstall( ResolverProblem_Ptr parent, PoolItemList & itemlist) : ProblemSolution (parent, "", "") { - _description = _("Do not install or delete concerning resolvables"); + _description = _("Do not install or delete the resolvables concerned"); for (PoolItemList::iterator iter = itemlist.begin(); iter != itemlist.end(); iter++) { diff --git a/zypp/solver/detail/ResolverInfoMisc.cc b/zypp/solver/detail/ResolverInfoMisc.cc index ed9820b..aa77368 100644 --- a/zypp/solver/detail/ResolverInfoMisc.cc +++ b/zypp/solver/detail/ResolverInfoMisc.cc @@ -156,7 +156,7 @@ ResolverInfoMisc::message (void) const case RESOLVER_INFO_TYPE_REJECT_INSTALL: { // Translator: %s = name of packages,patch,... // TranslatorExplanation: Additional information to dependency solver result. - msg = str::form (_("%s is scheduled to be installed, but this is not possible because of dependency problems."), + msg = str::form (_("%s is scheduled to be installed, but this is impossible due to dependency problems."), affected_str.c_str()); } break; @@ -164,7 +164,7 @@ ResolverInfoMisc::message (void) const case RESOLVER_INFO_TYPE_INSTALL_TO_BE_UNINSTALLED: { // Translator: %s = name of package,patch,... // TranslatorExplanation: Additional information to dependency solver result. - msg = str::form (_("Can't install %s since it is already marked as needing to be uninstalled"), + msg = str::form (_("Can't install %s since it is already marked as needed to be uninstalled"), affected_str.c_str()); } break; @@ -176,7 +176,7 @@ ResolverInfoMisc::message (void) const // TranslatorExplanation: do only apply if the package to-be-fixed is actually installed. // TranslatorExplanation: Here a patch was selected for installation but the to-be-fixed // TranslatorExplanation: package is not installed. - msg = str::form (_("Can't install %s since it is does not apply to this system."), + msg = str::form (_("Can't install %s, because it does not apply to this system."), affected_str.c_str()); } break; @@ -187,7 +187,7 @@ ResolverInfoMisc::message (void) const // other() = item 2 which has to be installed // other_capability() = // Translator: %s = name of package,patch,... - msg = str::form (_("Can't install %s, since %s is already marked as needing to be installed"), + msg = str::form (_("Can't install %s, because %s is already marked as needed to for installation"), affected_str.c_str(), toString (other()).c_str()); } @@ -289,7 +289,7 @@ ResolverInfoMisc::message (void) const // TranslatorExplanation: We just found out that 'foo' is not provided by anything else (an alternative) // TranslatorExplanation: removal of this resolvable would therefore break dependency // TranslatorExplanation: This is an error message explaining that the resolvable cannot be uninstalled - msg = str::form (_("There are no alternative installed providers of %s"), ResolverInfo::toString (_capability).c_str()); + msg = str::form (_("There are no alternative providers of %s installed"), ResolverInfo::toString (_capability).c_str()); if (affected()) { msg += " "; // Translator: 1.%s = name of package,patch.... @@ -338,7 +338,7 @@ ResolverInfoMisc::message (void) const // Translator: 1.%s = name of package,patch,..., 2.%s = name of package,patch,... // TranslatorExample: Upgrade to foo to avoid removing bar is not possible // TranslatorExplanation: bar requires something from foo - msg = str::form (_("Upgrade to %s to avoid removing %s is not possible."), + msg = str::form (_("Upgrading to %s to avoid removing %s is not possible."), other_str.c_str(), affected_str.c_str()); } @@ -487,7 +487,7 @@ ResolverInfoMisc::message (void) const // Translator: %s = name of package,patch,... // TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked. // TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable - msg = str::form (_("%s is required by other to-be-installed resolvable, so it won't be unlinked."), + msg = str::form (_("%s is required by another resolvable selected for installation, so it won't be unlinked."), affected_str.c_str()); } break; @@ -504,7 +504,7 @@ ResolverInfoMisc::message (void) const // Translator: %s = name of package,patch,... // TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked. // TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable - msg = str::form (_("%s is required by other installed resolvable, so it won't be unlinked."), + msg = str::form (_("%s is required by another installed resolvable, so it won't be unlinked."), affected_str.c_str()); } break; @@ -540,7 +540,7 @@ ResolverInfoMisc::message (void) const // Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,... // TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz - msg = str::form(_("A conflict over %s (%s) requires the removal of to-be-installed %s"), + msg = str::form(_("A conflict over %s (%s) requires the removal of %s which is scheduled for installation"), ResolverInfo::toString (_capability).c_str(), ResolverInfo::toString (_other_capability).c_str(), affected_str.c_str()); diff --git a/zypp/solver/detail/ResolverInfoMissingReq.cc b/zypp/solver/detail/ResolverInfoMissingReq.cc index b953aa5..10e6f74 100644 --- a/zypp/solver/detail/ResolverInfoMissingReq.cc +++ b/zypp/solver/detail/ResolverInfoMissingReq.cc @@ -61,7 +61,7 @@ ResolverInfoMissingReq::message( ) const string affected_str = ResolverInfo::toString(affected()); // Translator: 1.%s = name of package,patch,...; 2.%s = dependency - return str::form (_("%s is missing the requirement %s"), + return str::form (_("%s is lacking the requirement %s"), affected_str.c_str(), _missing.asString().c_str()); } diff --git a/zypp/solver/detail/Resolver_problems.cc b/zypp/solver/detail/Resolver_problems.cc index 12a8c74..2516747 100644 --- a/zypp/solver/detail/Resolver_problems.cc +++ b/zypp/solver/detail/Resolver_problems.cc @@ -321,9 +321,9 @@ Resolver::problems (const bool ignoreValidSolution) const if (!_tryAllPossibilities // a second run with ALL possibilities has not been tried && skippedPossibilities) { // possible other solutions skipped // give the user an additional solution for trying all branches - string what = _("No valid solution found with only resolvables of best architecture."); - string details = _("With this run only resolvables with the best architecture has been regarded.\n"); - details = details + _("Regarding all possible resolvables takes time but can come to a valid result."); + string what = _("No valid solution found with just resolvables of best architecture."); + string details = _("With this run only resolvables with the best architecture have been regarded.\n"); + details = details + _("Regarding all possible resolvables takes time, but can come to a valid result."); ResolverProblem_Ptr problem = new ResolverProblem (what, details); problem->addSolution (new ProblemSolutionAllBranches (problem)); problems.push_back (problem); @@ -435,7 +435,7 @@ Resolver::problems (const bool ignoreValidSolution) const what = str::form (_("Cannot install %s"), who.c_str()); // TranslatorExplanation %s = capability details = str::form (_("None provides %s"), missing_req->capability().asString().c_str()); - details += _("\nThere is no resource available which support this requirement."); + details += _("\nThere is no resource available which supports this requirement."); } break; @@ -443,7 +443,7 @@ Resolver::problems (const bool ignoreValidSolution) const case RESOLVER_INFO_TYPE_INVALID_SOLUTION: { // Marking this resolution attempt as invalid. ResolverInfoMisc_constPtr misc_info = dynamic_pointer_cast(info); what = misc_info->message(); - details = _("Due problems which are described above/below this resolution will not solve all dependencies"); + details = _("Due to the problems described above/below, this resolution will not solve all dependencies"); // no solution available } break; @@ -454,7 +454,7 @@ Resolver::problems (const bool ignoreValidSolution) const for (ConflictMap::const_iterator it = collector.conflictMap.begin(); it != collector.conflictMap.end(); ++it) { if (it->first == item) { - what = str::form (_("Cannot install %s because it is conflicting with %s"), + what = str::form (_("Cannot install %s, because it is conflicting with %s"), who.c_str(), it->second->name().c_str()) + "\n"; details = logAdditionalInfo(collector.additionalInfo, item); @@ -688,7 +688,7 @@ Resolver::problems (const bool ignoreValidSolution) const case RESOLVER_INFO_TYPE_UNINSTALL_PROVIDER: { // p provides c but is scheduled to be uninstalled ResolverInfoMisc_constPtr misc_info = dynamic_pointer_cast(info); // TranslatorExplanation %s = name of package, patch, selection ... - what =str::form (_("%s fulfil dependencies of %s but will be uninstalled"), + what =str::form (_("%s fulfills dependencies of %s but will be uninstalled"), misc_info->other()->name().c_str(), who.c_str()); details = misc_info->message(); @@ -698,7 +698,7 @@ Resolver::problems (const bool ignoreValidSolution) const case RESOLVER_INFO_TYPE_KEEP_PROVIDER: { // p provides c but is scheduled to be kept ResolverInfoMisc_constPtr misc_info = dynamic_pointer_cast(info); // TranslatorExplanation %s = name of package, patch, selection ... - what =str::form (_("%s fulfil dependencies of %s but will be kept on your system"), + what =str::form (_("%s fulfills dependencies of %s but will be kept on your system"), misc_info->other()->name().c_str(), who.c_str()); details = misc_info->message(); @@ -716,7 +716,7 @@ Resolver::problems (const bool ignoreValidSolution) const case RESOLVER_INFO_TYPE_NOT_INSTALLABLE_PROVIDER: { // p provides c but is uninstallable ResolverInfoMisc_constPtr misc_info = dynamic_pointer_cast(info); // TranslatorExplanation %s = name of package, patch, selection ... - what = str::form (_("Cannot install %s to fulfil the dependencies of %s"), + what = str::form (_("Cannot install %s to fulfill the dependencies of %s"), misc_info->other()->name().c_str(), who.c_str()); details = misc_info->message(); @@ -769,7 +769,7 @@ Resolver::problems (const bool ignoreValidSolution) const case RESOLVER_INFO_TYPE_UNINSTALL_TO_BE_INSTALLED: { // p is to-be-installed, so it won't be unlinked. ResolverInfoMisc_constPtr misc_info = dynamic_pointer_cast(info); // TranslatorExplanation %s = name of package, patch, selection ... - what = str::form (_("%s will not be uninstalled cause it is still required"), who.c_str()); + what = str::form (_("%s will not be uninstalled, because it is still required"), who.c_str()); details = misc_info->message(); // It is only an info --> no solution is needed } @@ -777,7 +777,7 @@ Resolver::problems (const bool ignoreValidSolution) const case RESOLVER_INFO_TYPE_UNINSTALL_INSTALLED: { // p is required by installed, so it won't be unlinked. ResolverInfoMisc_constPtr misc_info = dynamic_pointer_cast(info); // TranslatorExplanation %s = name of package, patch, selection ... - what = str::form (_("%s will not be uninstalled cause it is still required"), who.c_str()); + what = str::form (_("%s will not be uninstalled, because it is still required"), who.c_str()); details = misc_info->message() + "\n"; details += logAdditionalInfo(collector.additionalInfo, item); @@ -800,7 +800,7 @@ Resolver::problems (const bool ignoreValidSolution) const if (misc_info->trigger() == ResolverInfoMisc::OBSOLETE) { // TranslatorExplanation %s = name of package, patch, selection ... - details = str::form (_("%s obsoletes %s. But %s cannot be deleted because it is locked."), + details = str::form (_("%s obsoletes %s. But %s cannot be deleted, because it is locked."), misc_info->other()->name().c_str(), who.c_str(), who.c_str()) + "\n"; details += logAdditionalInfo(collector.additionalInfo, item); @@ -828,11 +828,11 @@ Resolver::problems (const bool ignoreValidSolution) const ResolverInfoMisc_constPtr misc_info = dynamic_pointer_cast(info); // TranslatorExplanation %s = name of package, patch, selection ... if (misc_info->other()) - what = str::form (_("Cannot install %s because it is conflicting with %s"), + what = str::form (_("Cannot install %s, because it is conflicting with %s"), who.c_str(), misc_info->other()->name().c_str()); else - what = str::form (_("Cannot install %s because it is conflicting"), + what = str::form (_("Cannot install %s, because it is conflicting"), who.c_str()); details = misc_info->message() + "\n"; details += logAdditionalInfo(collector.additionalInfo, item); diff --git a/zypp/target/rpm/RpmDb.cc b/zypp/target/rpm/RpmDb.cc index 4d2ed77..4dc2780 100644 --- a/zypp/target/rpm/RpmDb.cc +++ b/zypp/target/rpm/RpmDb.cc @@ -1910,12 +1910,12 @@ void RpmDb::doInstallPackage( const Pathname & filename, unsigned flags, callbac { processConfigFiles(*it, Pathname::basename(filename), " saved as ", // %s = filenames - _("rpm saved %s as %s but it was impossible to determine the difference"), + _("rpm saved %s as %s, but it was impossible to determine the difference"), // %s = filenames _("rpm saved %s as %s.\nHere are the first 25 lines of difference:\n")); processConfigFiles(*it, Pathname::basename(filename), " created as ", // %s = filenames - _("rpm created %s as %s but it was impossible to determine the difference"), + _("rpm created %s as %s, but it was impossible to determine the difference"), // %s = filenames _("rpm created %s as %s.\nHere are the first 25 lines of difference:\n")); } -- 2.7.4