February 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r8953 - /trunk/zypper/src/zypper-misc.cc
by jkupec＠svn.opensuse.org 28 Feb '08

28 Feb '08

Author: jkupec Date: Thu Feb 28 21:09:08 2008 New Revision: 8953 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8953&view=rev Log: - even better prompt :O) Modified: trunk/zypper/src/zypper-misc.cc Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=89… ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Thu Feb 28 21:09:08 2008 @@ -483,7 +483,10 @@ return false; } - stm << _("Choose from above solutions by number or skip, retry or cancel"); + stm << _PL( + "Choose the above solution using '1' or skip, retry or cancel", + "Choose from above solutions by number or skip, retry or cancel", + solutions.size()); zypper.out().prompt(PROMPT_DEP_RESOLVE, stm.str(), // TranslatorExplanation: dependency problem solution input prompt -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8952 - /trunk/zypper/src/zypper-misc.cc
by jkupec＠svn.opensuse.org 28 Feb '08

28 Feb '08

Author: jkupec Date: Thu Feb 28 20:56:09 2008 New Revision: 8952 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8952&view=rev Log: - better prompt text (bnc #365236) Modified: trunk/zypper/src/zypper-misc.cc Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=89… ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Thu Feb 28 20:56:09 2008 @@ -482,8 +482,8 @@ zypper.out().error(stm.str()); return false; } - - stm << _("Choose the number, skip, retry or cancel"); + + stm << _("Choose from above solutions by number or skip, retry or cancel"); zypper.out().prompt(PROMPT_DEP_RESOLVE, stm.str(), // TranslatorExplanation: dependency problem solution input prompt -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8951 - /trunk/zypper/src/zypper-misc.cc
by jkupec＠svn.opensuse.org 28 Feb '08

28 Feb '08

Author: jkupec Date: Thu Feb 28 20:51:59 2008 New Revision: 8951 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8951&view=rev Log: - show solver problem text within the prompt Modified: trunk/zypper/src/zypper-misc.cc Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=89… ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Thu Feb 28 20:51:59 2008 @@ -470,7 +470,6 @@ if (!det.empty ()) stm << indent(det, 2) << endl; } - cout << stm.str(); if (zypper.globalOpts().non_interactive) return false; @@ -479,10 +478,15 @@ do { // without solutions, its useless to prompt if (solutions.empty()) - return false; - // TranslatorExplanation: dependency problem solution input prompt - zypper.out().prompt(PROMPT_DEP_RESOLVE, - _("Choose the number, (s)kip, (r)etry or (c)ancel"), + { + zypper.out().error(stm.str()); + return false; + } + + stm << _("Choose the number, skip, retry or cancel"); + + zypper.out().prompt(PROMPT_DEP_RESOLVE, stm.str(), + // TranslatorExplanation: dependency problem solution input prompt _("[#/s/r/c]")); string reply_s = str::getline (cin, zypp::str::TRIM); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8950 - in /trunk/zypper/src: zypper-misc.cc zypper-utils.cc zypper-utils.h
by jkupec＠svn.opensuse.org 28 Feb '08

28 Feb '08

Author: jkupec Date: Thu Feb 28 19:40:16 2008 New Revision: 8950 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8950&view=rev Log: - fixed solver solution detail text indentation (bnc #358871) Modified: trunk/zypper/src/zypper-misc.cc trunk/zypper/src/zypper-utils.cc trunk/zypper/src/zypper-utils.h Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=89… ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Thu Feb 28 19:40:16 2008 @@ -450,8 +450,7 @@ static tribool show_problem (Zypper & zypper, const ResolverProblem & prob, ProblemSolutionList & todo) { - //! \todo use Out - ostream& stm = cerr; + ostringstream stm; string det; stm << _("Problem: ") << prob.description () << endl; det = prob.details (); @@ -469,8 +468,9 @@ stm << format (_(" Solution %d: ")) % n << (*ii)->description () << endl; det = (*ii)->details (); if (!det.empty ()) - stm << " " << det << endl; + stm << indent(det, 2) << endl; } + cout << stm.str(); if (zypper.globalOpts().non_interactive) return false; Modified: trunk/zypper/src/zypper-utils.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-utils.cc?rev=8… ============================================================================== --- trunk/zypper/src/zypper-utils.cc (original) +++ trunk/zypper/src/zypper-utils.cc Thu Feb 28 19:40:16 2008 @@ -240,3 +240,23 @@ iobind::parser::xml_escape_parser parser; return parser.escape(text); } + +string & replace_all(string & str, const string & from, const string & to) +{ + size_t pos = 0; + while((pos = str.find(from, pos)) != string::npos) + { + str.replace(pos, from.size(), to); + pos += to.size(); + } + return str; +} + +std::string & indent(std::string & text, int columns) +{ + string indent(columns, ' '); indent.insert(0, 1, '\n'); + cout << "to: '" << indent << "'" << endl; + replace_all(text, "\n", indent); + text.insert(0, string(columns, ' ')); + return text; +} \ No newline at end of file Modified: trunk/zypper/src/zypper-utils.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-utils.h?rev=89… ============================================================================== --- trunk/zypper/src/zypper-utils.h (original) +++ trunk/zypper/src/zypper-utils.h Thu Feb 28 19:40:16 2008 @@ -57,4 +57,6 @@ std::string xml_encode(const std::string & text); +std::string & indent(std::string & text, int columns); + #endif /*ZYPPER_UTILS_H*/ -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8949 - /trunk/libzypp/package/libzypp.changes
by jkupec＠svn.opensuse.org 28 Feb '08

28 Feb '08

Author: jkupec Date: Thu Feb 28 16:44:52 2008 New Revision: 8949 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8949&view=rev Log: changes Modified: trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Thu Feb 28 16:44:52 2008 @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Feb 28 16:43:11 CET 2008 - jkupec(a)suse.cz + +- special exception message if server returns 403 response + (forbidden) (port from SP2) +- MediaException messages marked for translation + Wed Feb 27 10:31:24 CET 2008 - dmacvicar(a)suse.de ------------------------------------------------------------------- -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8948 - in /trunk/libzypp/zypp/media: MediaCurl.cc MediaException.cc MediaException.h
by jkupec＠svn.opensuse.org 28 Feb '08

28 Feb '08

Author: jkupec Date: Thu Feb 28 16:43:07 2008 New Revision: 8948 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8948&view=rev Log: - FATE #303284 port from SP2 - special exception message if server returns 403 (forbidden) - MediaException messages marked for translation Modified: trunk/libzypp/zypp/media/MediaCurl.cc trunk/libzypp/zypp/media/MediaException.cc trunk/libzypp/zypp/media/MediaException.h Modified: trunk/libzypp/zypp/media/MediaCurl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaCurl.cc?… ============================================================================== --- trunk/libzypp/zypp/media/MediaCurl.cc (original) +++ trunk/libzypp/zypp/media/MediaCurl.cc Thu Feb 28 16:43:07 2008 @@ -16,6 +16,7 @@ #include "zypp/base/Logger.h" #include "zypp/ExternalProgram.h" #include "zypp/base/String.h" +#include "zypp/base/Gettext.h" #include "zypp/base/Sysconfig.h" #include "zypp/base/Gettext.h" @@ -1020,6 +1021,11 @@ )); } else + if ( httpReturnCode == 403) + { + ZYPP_THROW(MediaForbiddenException(url)); + } + else if ( httpReturnCode == 404) { err_file_not_found = true; @@ -1231,6 +1237,11 @@ )); } else + if ( httpReturnCode == 403) + { + ZYPP_THROW(MediaForbiddenException(url)); + } + else if ( httpReturnCode == 404) { ZYPP_THROW(MediaFileNotFoundException(_url, filename)); Modified: trunk/libzypp/zypp/media/MediaException.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaExceptio… ============================================================================== --- trunk/libzypp/zypp/media/MediaException.cc (original) +++ trunk/libzypp/zypp/media/MediaException.cc Thu Feb 28 16:43:07 2008 @@ -10,12 +10,15 @@ * */ -#include <string> #include <iostream> +#include "zypp/base/String.h" +#include "zypp/base/Gettext.h" + #include "zypp/media/MediaException.h" using namespace std; +using zypp::str::form; /////////////////////////////////////////////////////////////////// namespace zypp @@ -25,158 +28,179 @@ std::ostream & MediaMountException::dumpOn( std::ostream & str ) const { - str << "Failed to mount " << _source << " on " << _target; + str << form(_("Failed to mount %s on %s"), _source.c_str(), _target.c_str()); if( !_cmdout.empty()) - str << ": " << _error << " (" << _cmdout << ")"; + str << ": " << _error << " (" << _cmdout << ")" << endl; else - str << ": " << _error; + str << ": " << _error << endl; return str; } std::ostream & MediaUnmountException::dumpOn( std::ostream & str ) const { - return str << "Failed to unmount " << _path - << " : " << _error; + return str << form(_("Failed to unmount %s"), _path.c_str()) + << " : " << _error << endl; } std::ostream & MediaBadFilenameException::dumpOn( std::ostream & str ) const { - return str << "Bad file name " << _filename; + return str << form(_("Bad file name: %s"), _filename.c_str()) << endl; } std::ostream & MediaNotOpenException::dumpOn( std::ostream & str ) const { - return str << "Media not opened while performing action " << _action; + return str << form( + _("Medium not opened when trying to perform action '%s'."), _action.c_str()) + << endl; } std::ostream & MediaFileNotFoundException::dumpOn( std::ostream & str) const { - return str << "File " << _filename - << " not found on media: " << _url; + return str << form( + _("File '%s' not found on medium '%s'"), + _filename.c_str(), _url.c_str()) + << endl; } std::ostream & MediaWriteException::dumpOn( std::ostream & str) const { - return str << "Cannot write file " << _filename; + return str << form(_("Cannot write file '%s'."), _filename.c_str()) << endl; } std::ostream & MediaNotAttachedException::dumpOn( std::ostream & str) const { - return str << "Media not attached: " << _url; + return str << _("Medium not attached") << ": " << _url << endl; } std::ostream & MediaBadAttachPointException::dumpOn( std::ostream & str) const { - return str << "Bad media attach point: " << _url; + return str << _("Bad media attach point") << ": " << _url << endl; } std::ostream & MediaCurlInitException::dumpOn( std::ostream & str) const { - return str << "Curl init failed for: " << _url; + return str << form( + // TranslatorExplanation: curl is the name of a library, don't translate + _("Download (curl) initialization failed for '%s'"), _url.c_str()) + << endl; } std::ostream & MediaSystemException::dumpOn( std::ostream & str) const { - return str << "System exception: " << _message - << " on media: " << _url; + return str << form( + _("System exception '%s' on medium '%s'."), + _message.c_str(), _url.c_str()) << endl; } std::ostream & MediaNotAFileException::dumpOn( std::ostream & str) const { - return str << "Path " << _path - << " on media: " << _url - << " is not a file."; + return str << form( + _("Path '%s' on medium '%s' is not a file."), + _path.c_str(), _url.c_str()) + << endl; } std::ostream & MediaNotADirException::dumpOn( std::ostream & str) const { - return str << "Path " << _path - << " on media: " << _url - << " is not a directory."; + return str << form( + _("Path '%s' on medium '%s' is not a directory."), + _path.c_str(), _url.c_str()) + << endl; } std::ostream & MediaBadUrlException::dumpOn( std::ostream & str) const { if( _msg.empty()) { - return str << "Malformed URL: " << _url; + return str << _("Malformed URI") << ": " << _url << endl; } else { - return str << _msg << ": " << _url; + return str << _msg << ": " << _url << endl; } } std::ostream & MediaBadUrlEmptyHostException::dumpOn( std::ostream & str) const { - return str << "Empty host name in URL: " << _url; + return str << _("Empty host name in URI") << ": " << _url << endl; } std::ostream & MediaBadUrlEmptyFilesystemException::dumpOn( std::ostream & str) const { - return str << "Empty filesystem in URL: " << _url; + return str << _("Empty filesystem in URI") << ": " << _url << endl; } std::ostream & MediaBadUrlEmptyDestinationException::dumpOn( std::ostream & str) const { - return str << "Empty destination in URL: " << _url; + return str << _("Empty destination in URI") << ": " << _url << endl; } std::ostream & MediaUnsupportedUrlSchemeException::dumpOn( std::ostream & str) const { - return str << "Unsupported URL scheme in URL: " << _url; + return str << form(_("Unsupported URI scheme in '%s'."), _url.c_str()) << endl; } std::ostream & MediaNotSupportedException::dumpOn( std::ostream & str) const { - return str << "Operation not supported by media: " << _url; + return str << _("Operation not supported by medium") << ": " << _url << endl; } std::ostream & MediaCurlException::dumpOn( std::ostream & str) const { - return str << "Curl error for '" << _url << "':" << endl - << "Error code: " << _err << endl - << "Error message: " << _msg; + // TranslatorExplanation: curl is the name of a library, don't translate + return str << form(_( + "Download (curl) error for '%s':\n" + "Error code: %s\n" + "Error message: %s\n"), _url.c_str(), _err.c_str(), _msg.c_str()); } std::ostream & MediaCurlSetOptException::dumpOn( std::ostream & str) const { - return str << "Error occurred while setting CURL options for " << _url - << ": " << _msg; + return str << form( + // TranslatorExplanation: curl is the name of a library, don't translate + _("Error occurred while setting download (curl) options for '%s':"), + _url.c_str()) + << endl << _msg << endl; } std::ostream & MediaNotDesiredException::dumpOn( std::ostream & str ) const { - return str << "Media source " << _url << " does not contain the desired media"; + return str << form( + _("Media source '%s' does not contain the desired medium"), _url.c_str()) + << endl; } std::ostream & MediaIsSharedException::dumpOn( std::ostream & str ) const { - return str << "Media " << _name << " is in use by another instance"; + return str << form(_("Medium '%s' is in use by another instance"), _name.c_str()) + << endl; } std::ostream & MediaNotEjectedException::dumpOn( std::ostream & str ) const { if( _name.empty()) - return str << "Can't eject any media"; + return str << _("Cannot eject any media") << endl; else - return str << "Can't eject media " << _name; + return str << form(_("Cannot eject media '%s'"), _name.c_str()) << endl; } std::ostream & MediaUnauthorizedException::dumpOn( std::ostream & str ) const { str << msg(); if( !_url.asString().empty()) - { str << " (" << _url << ")"; - } if( !_err.empty()) - { str << ": " << _err; - } return str; } + std::ostream & MediaForbiddenException::dumpOn( std::ostream & str ) const + { + if (_msg.empty()) + return str << form(_("Permission to access '%s' denied."), _url.c_str()) << endl; + return str << _msg << endl; + } + ///////////////////////////////////////////////////////////////// } // namespace media } // namespace zypp Modified: trunk/libzypp/zypp/media/MediaException.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaExceptio… ============================================================================== --- trunk/libzypp/zypp/media/MediaException.h (original) +++ trunk/libzypp/zypp/media/MediaException.h Thu Feb 28 16:43:07 2008 @@ -456,6 +456,20 @@ std::string _hint; }; + class MediaForbiddenException : public MediaException + { + public: + MediaForbiddenException(const Url & url_r, const std::string & msg = "") + : MediaException(msg) + , _url(url_r.asString()), _msg(msg) + {} + virtual ~MediaForbiddenException() throw() {}; + protected: + virtual std::ostream & dumpOn( std::ostream & str ) const; + std::string _url; + std::string _msg; + }; + ///////////////////////////////////////////////////////////////// } // namespace media } // namespace zypp -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8947 - /branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/media/MediaCurl.cc
by jkupec＠svn.opensuse.org 28 Feb '08

28 Feb '08

Author: jkupec Date: Thu Feb 28 15:41:04 2008 New Revision: 8947 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8947&view=rev Log: - one more string forgotten Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/media/MediaCurl.cc Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/media/MediaCurl.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/libzyp… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/media/MediaCurl.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/media/MediaCurl.cc Thu Feb 28 15:41:04 2008 @@ -1101,7 +1101,7 @@ msg403 = str::form(_( "Permission to access '%s' denied.\n\n" "Visit the Novell Customer Center to check whether" - " your registration is valid and not expired."), + " your registration is valid and has not expired."), url.asString().c_str()); ZYPP_THROW(MediaForbiddenException(url, msg403)); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8946 - in /branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/media: MediaCurl.cc MediaException.cc
by jkupec＠svn.opensuse.org 28 Feb '08

28 Feb '08

Author: jkupec Date: Thu Feb 28 15:06:17 2008 New Revision: 8946 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8946&view=rev Log: - one more update of texts Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/media/MediaCurl.cc branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/media/MediaException.cc Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/media/MediaCurl.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/libzyp… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/media/MediaCurl.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/media/MediaCurl.cc Thu Feb 28 15:06:17 2008 @@ -881,7 +881,7 @@ msg403 = str::form(_( "Permission to access '%s' denied.\n\n" "Visit the Novell Customer Center to check whether" - " your registration is valid and not expired."), + " your registration is valid and has not expired."), url.asString().c_str()); ZYPP_THROW(MediaForbiddenException(url, msg403)); Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/media/MediaException.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/libzyp… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/media/MediaException.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/media/MediaException.cc Thu Feb 28 15:06:17 2008 @@ -179,9 +179,9 @@ std::ostream & MediaNotEjectedException::dumpOn( std::ostream & str ) const { if( _name.empty()) - return str << _("Can't eject any media") << endl; + return str << _("Cannot eject any media") << endl; else - return str << form(_("Can't eject media '%s'"), _name.c_str()) << endl; + return str << form(_("Cannot eject media '%s'"), _name.c_str()) << endl; } std::ostream & MediaForbiddenException::dumpOn( std::ostream & str ) const -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8945 - in /trunk/zypper/src: zypper-misc.cc zypper.cc
by jkupec＠svn.opensuse.org 28 Feb '08

28 Feb '08

Author: jkupec Date: Thu Feb 28 12:40:16 2008 New Revision: 8945 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8945&view=rev Log: - texts update from SP2 proof-reading Modified: trunk/zypper/src/zypper-misc.cc trunk/zypper/src/zypper.cc Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=89… ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Thu Feb 28 12:40:16 2008 @@ -1158,7 +1158,7 @@ if (!tbl.empty ()) zypper.out().warning( _("These are only the updates affecting the updater itself.\n" - "There are others available too.\n")); + "Other updates are available too.\n")); tbl = pm_tbl; } @@ -1646,7 +1646,7 @@ if (retv == ZYPPER_EXIT_INF_REBOOT_NEEDED) zypper.out().warning( _("One of installed patches requires reboot of" - " your machine. Please do it as soon as possible.")); + " your machine. Reboot as soon as possible.")); else if (retv == ZYPPER_EXIT_INF_RESTART_NEEDED) zypper.out().warning( _("One of installed patches affects the package" Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=8945&r1… ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Thu Feb 28 12:40:16 2008 @@ -144,12 +144,12 @@ "\t--terse, -t\t\tTerse output for machine consumption.\n" "\t--table-style, -s\tTable style (integer).\n" "\t--rug-compatible, -r\tTurn on rug compatibility.\n" - "\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n" + "\t--non-interactive, -n\tDo not ask anything, use default answers automatically.\n" "\t--reposd-dir, -D <dir>\tUse alternative repository definition files directory.\n" "\t--cache-dir, -C <dir>\tUse alternative meta-data cache database directory.\n" "\t--raw-cache-dir <dir>\tUse alternative raw meta-data cache directory\n" ); - + static string help_global_source_options = _( "\tRepository Options:\n" "\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n" @@ -324,7 +324,7 @@ if (gopts.count("no-gpg-checks")) { _gopts.no_gpg_checks = true; - out().info(_("Entering no-gpg-checks mode."), Out::HIGH); + out().info(_("Entering 'no-gpg-checks' mode."), Out::HIGH); MIL << "Entering no-gpg-checks mode" << endl; } @@ -1139,8 +1139,8 @@ " Command options:\n" " --match-all Search for a match with all search strings (default)\n" " --match-any Search for a match with any of the search strings\n" - " --match-substrings Matches with search strings may be partial words (default)\n" - " --match-words Matches with search strings may only be whole words\n" + " --match-substrings Search for a match to partial words (default)\n" + " --match-words Search for a match to whole words only\n" " --match-exact Searches for an exact package name\n" "-d, --search-descriptions Search also in package summaries and descriptions.\n" "-C, --case-sensitive Perform case-sensitive search.\n" -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8944 - /branches/SuSE-SLE-10-SP2-Branch/zypper/package/zypper.changes
by jkupec＠svn.opensuse.org 28 Feb '08

28 Feb '08

Author: jkupec Date: Thu Feb 28 12:21:35 2008 New Revision: 8944 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8944&view=rev Log: changes Modified: branches/SuSE-SLE-10-SP2-Branch/zypper/package/zypper.changes Modified: branches/SuSE-SLE-10-SP2-Branch/zypper/package/zypper.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/zypper… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/zypper/package/zypper.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/zypper/package/zypper.changes Thu Feb 28 12:21:35 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 28 12:20:56 CET 2008 - jkupec(a)suse.cz + +- texts correction based on proof-reading +- r8943 + +------------------------------------------------------------------- Wed Nov 28 14:43:17 CET 2007 - jkupec(a)suse.cz - quit if not root without trying to do anything except displaying help -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0