Author: jkupec
Date: Thu Jul 19 14:47:39 2007
New Revision: 6089
URL: http://svn.opensuse.org/viewcvs/zypp?rev=6089&view=rev
Log:
- some texts clean-up
Modified:
trunk/zypper/doc/zypper.8
trunk/zypper/src/zypper-callbacks.cc
trunk/zypper/src/zypper-callbacks.h
trunk/zypper/src/zypper-info.cc
trunk/zypper/src/zypper-misc.cc
trunk/zypper/src/zypper-rpm-callbacks.h
trunk/zypper/src/zypper-search.h
trunk/zypper/src/zypper.cc
Modified: trunk/zypper/doc/zypper.8
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=6089&r1=6088&r2=6089&view=diff
==============================================================================
--- trunk/zypper/doc/zypper.8 (original)
+++ trunk/zypper/doc/zypper.8 Thu Jul 19 14:47:39 2007
@@ -271,7 +271,7 @@
Switches to non-interactive mode. In this mode zypper doesn't ask user to type answers to various prompts, but uses default answers automatically.
.TP
.I \-\-no\-gpg\-checks
-Ignore gpg check failures and continue.
+Ignore GPG check failures and continue. If a GPG issue occurs when using this option zypper prints and logs a warning and automatically continues without interrupting the operation. Use this option with causion, as you can easily overlook security problems by using it.
.TP
.I \-R, \-\-root <dir>
Operates on a different root directory.
Modified: trunk/zypper/src/zypper-callbacks.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-callbacks.cc?rev=6089&r1=6088&r2=6089&view=diff
==============================================================================
--- trunk/zypper/src/zypper-callbacks.cc (original)
+++ trunk/zypper/src/zypper-callbacks.cc Thu Jul 19 14:47:39 2007
@@ -49,7 +49,7 @@
//template<typename Action>
//Action ...
int read_action_ari (int default_action) {
- // TranslatorExplanation don't translate letters in parentheses!!
+ // TranslatorExplanation don't translate letters in parentheses!! (yet)
cout << _("(A)bort, (R)etry, (I)gnore?") << " ";
// choose abort if no default has been specified
Modified: trunk/zypper/src/zypper-callbacks.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-callbacks.h?rev=6089&r1=6088&r2=6089&view=diff
==============================================================================
--- trunk/zypper/src/zypper-callbacks.h (original)
+++ trunk/zypper/src/zypper-callbacks.h Thu Jul 19 14:47:39 2007
@@ -13,6 +13,8 @@
#include <string>
#include
+#include "zypper.h"
+
/*
enum Error {
NO_ERROR,
@@ -31,7 +33,8 @@
void display_error (Error error, const std::string& reason) {
if (error != 0 /*NO_ERROR*/) {
static const char * error_s[] = {
- "", "Not found", "I/O error", "Invalid object"
+ // TranslatorExplanation These are reasons for various failures.
+ "", _("Not found"), _("I/O error"), _("Invalid object")
};
ostream& stm = std::cerr;
stm << error_s[error];
Modified: trunk/zypper/src/zypper-info.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-info.cc?rev=6089&r1=6088&r2=6089&view=diff
==============================================================================
--- trunk/zypper/src/zypper-info.cc (original)
+++ trunk/zypper/src/zypper-info.cc Thu Jul 19 14:47:39 2007
@@ -2,6 +2,8 @@
#include <iostream>
+#include
+
#include
#include
#include
@@ -11,6 +13,7 @@
using namespace std;
using namespace zypp;
+using boost::format;
extern ZYpp::Ptr God;
extern Settings gSettings;
@@ -45,11 +48,16 @@
);
if (!installer.item) {
- cout << "\n" << kind.asString() << " " << *nameit << _(" not found.") << endl;
+ // TranslatorExplanation E.g. "package zypper not found."
+ cout << "\n" << format(_("%s %s not found.")) % kind.asString() % *nameit
+ << endl;
}
else {
// print info
- cout << endl << _("Information for ") << kind.asString() << " " << *nameit << ":\n\n";
+ // TranslatorExplanation E.g. "Information for package zypper:"
+ cout << endl << format(_("Information for %s %s:")) % kind.asString() % *nameit;
+
+ cout << endl << endl;
if (command == ZypperCommand::INFO)
printPkgInfo(installer.item,installed);
@@ -130,43 +138,44 @@
*
*/
void printPatchInfo(const PoolItem & pool_item, const PoolItem & ins_pool_item) {
- cout << "Name: " << pool_item.resolvable()->name() << endl;
- cout << "Version: " << pool_item.resolvable()->edition().asString() << endl;
- cout << "Arch: " << pool_item.resolvable()->arch().asString() << endl;
+ cout << _("Name: ") << pool_item.resolvable()->name() << endl;
+ cout << _("Version: ") << pool_item.resolvable()->edition().asString() << endl;
+ cout << _("Arch: ") << pool_item.resolvable()->arch().asString() << endl;
- cout << "Status: "; // TODO debug
+ cout << _("Status: "); // TODO debug
bool i = ins_pool_item ? true : false;
if (pool_item.status().isUndetermined ())
- cout << (i ? "Installed": "Uninstalled");
+ cout << (i ? _("Installed"): _("Uninstalled"));
else if (pool_item.status().isEstablishedUneeded ())
- cout << (i ? "No Longer Applicable": "Not Applicable");
+ cout << (i ? _("No Longer Applicable"): _("Not Applicable"));
else if (pool_item.status().isEstablishedSatisfied ())
- cout << (i ? "Applied": "Not Needed");
+ cout << (i ? _("Applied"): _("Not Needed"));
else if (pool_item.status().isEstablishedIncomplete ())
- cout << (i ? "Broken": "Needed");
+ cout << (i ? _("Broken"): _("Needed"));
cout << endl;
Patch::constPtr patch = asKind<Patch>(pool_item.resolvable());
- cout << "Category: " << patch->category() << endl;
- cout << "Created On: " << patch->timestamp().asString() << endl;
- cout << "Reboot Required: " << (patch->reboot_needed() ? "Yes" : "No") << endl;
-
+ cout << _("Category: ") << patch->category() << endl;
+ cout << _("Created On: ") << patch->timestamp().asString() << endl;
+ cout << _("Reboot Required: ") << (patch->reboot_needed() ? _("Yes") : _("No")) << endl;
+
if (!gSettings.is_rug_compatible)
- cout << "Package Manager ";
- cout << "Restart Required: ";
- cout << (patch->affects_pkg_manager() ? "Yes" : "No") << endl;
-
- cout << "Interactive: " << (patch->interactive() ? "Yes" : "No") << endl;
- cout << "Summary: " << pool_item.resolvable()->summary() << endl;
- cout << "Description: " << pool_item.resolvable()->description() << endl;
+ cout << _("Package Manager Restart Required");
+ else
+ cout << _("Restart Required: ");
+ cout << (patch->affects_pkg_manager() ? _("Yes") : _("No")) << endl;
+
+ cout << _("Interactive: ") << (patch->interactive() ? _("Yes") : _("No")) << endl;
+ cout << _("Summary: ") << pool_item.resolvable()->summary() << endl;
+ cout << _("Description: ") << pool_item.resolvable()->description() << endl;
- cout << "Provides:" << endl;
+ cout << _("Provides:") << endl;
CapSet capSet = pool_item.resolvable()->dep(zypp::Dep::PROVIDES);
for (CapSet::const_iterator it = capSet.begin(); it != capSet.end(); ++it) {
cout << it->refers().asString() << ": " << it->asString() << endl;
}
- cout << endl << "Requires:" << endl;
+ cout << endl << _("Requires:") << endl;
capSet = pool_item.resolvable()->dep(zypp::Dep::REQUIRES);
for (CapSet::const_iterator it = capSet.begin(); it != capSet.end(); ++it) {
cout << it->refers().asString() << ": " << it->asString() << endl;
Modified: trunk/zypper/src/zypper-misc.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=6089&r1=6088&r2=6089&view=diff
==============================================================================
--- trunk/zypper/src/zypper-misc.cc (original)
+++ trunk/zypper/src/zypper-misc.cc Thu Jul 19 14:47:39 2007
@@ -238,7 +238,8 @@
ee = solutions.end (),
ii;
for (n = 1, ii = bb; ii != ee; ++n, ++ii) {
- stm << format (_(" Solution %s: ")) % n << (*ii)->description () << endl;
+ // TranslatorExplanation %d is the solution number
+ stm << format (_(" Solution %d: ")) % n << (*ii)->description () << endl;
det = (*ii)->details ();
if (!det.empty ())
stm << " " << det << endl;
@@ -539,7 +540,8 @@
Table tbl;
TableHeader th;
- th << _("Catalog") << _("Name") << _("Version") << _("Category") << _("Status");
+ th << (gSettings.is_rug_compatible ? _("Catalog: ") : _("Repository: "))
+ << _("Name") << _("Version") << _("Category") << _("Status");
tbl << th;
ResPool::byKind_iterator
@@ -575,7 +577,7 @@
void xml_list_patches ()
{
- const zypp::ResPool& pool = God->pool();
+ const zypp::ResPool& pool = God->pool();
ResPool::byKind_iterator
it = pool.byKindBegin<Patch> (),
e = pool.byKindEnd<Patch> ();
@@ -583,29 +585,29 @@
for (; it != e; ++it )
{
ResObject::constPtr res = it->resolvable();
- if ( it->status().isNeeded() ) {
+ if ( it->status().isNeeded() )
+ {
Patch::constPtr patch = asKind<Patch>(res);
- cout << " name () << "\" " ;
- cout << "edition=\"" << res->edition ().asString() << "\" ";
- cout << "category=\"" << patch->category() << "\" ";
- cout << "pkgmanager=\"" << ((patch->affects_pkg_manager()) ? "true" : "false") << "\" ";
- cout << "restart=\"" << ((patch->reboot_needed()) ? "true" : "false") << "\" ";
- cout << "interactive=\"" << ((patch->interactive()) ? "true" : "false") << "\" ";
- cout << "resolvabletype=\"" << "patch" << "\" ";
- cout << ">" << endl;
- cout << " <summary>" << xml_escape(patch->summary()) << " </summary>" << endl;
- cout << " <description>" << xml_escape(patch->description()) << "</description>" << endl;
- cout << " <license>" << xml_escape(patch->licenseToConfirm()) << "</license>" << endl;
-
+ cout << " name () << "\" " ;
+ cout << "edition=\"" << res->edition ().asString() << "\" ";
+ cout << "category=\"" << patch->category() << "\" ";
+ cout << "pkgmanager=\"" << ((patch->affects_pkg_manager()) ? "true" : "false") << "\" ";
+ cout << "restart=\"" << ((patch->reboot_needed()) ? "true" : "false") << "\" ";
+ cout << "interactive=\"" << ((patch->interactive()) ? "true" : "false") << "\" ";
+ cout << "resolvabletype=\"" << "patch" << "\" ";
+ cout << ">" << endl;
+ cout << " <summary>" << xml_escape(patch->summary()) << " </summary>" << endl;
+ cout << " <description>" << xml_escape(patch->description()) << "</description>" << endl;
+ cout << " <license>" << xml_escape(patch->licenseToConfirm()) << "</license>" << endl;
- if ( patch->repository() != Repository::noRepository )
- {
- cout << "